diff --git a/smardigo/backup/datasource/awx-job-plain.json b/smardigo/backup/datasource/awx-job-plain.json
index 00db778..7aed883 100644
--- a/smardigo/backup/datasource/awx-job-plain.json
+++ b/smardigo/backup/datasource/awx-job-plain.json
@@ -1,19 +1,23 @@
{
- "name" : "awx-job-plain",
- "restApi" : true,
- "configKey" : "awx-job-plain",
- "payloadType" : "REST",
- "config" : [ {
- "name" : "connection",
- "type" : "CONNECTION",
- "value" : "awx"
- }, {
- "name" : "resource",
- "type" : "STRING",
- "value" : "api/v2/jobs/${id}/"
- }, {
- "name" : "sqlStatement",
- "type" : "STRING",
- "value" : "SELECT status,failed,started,finished,name,description FROM default_table"
- } ]
-}
\ No newline at end of file
+ "name": "awx-job-plain",
+ "restApi": true,
+ "configKey": "awx-job-plain",
+ "payloadType": "REST",
+ "config": [
+ {
+ "name": "connection",
+ "type": "CONNECTION",
+ "value": "awx"
+ },
+ {
+ "name": "resource",
+ "type": "STRING",
+ "value": "api/v2/jobs/${id}/"
+ },
+ {
+ "name": "sqlStatement",
+ "type": "STRING",
+ "value": "SELECT id,status,failed,created,started,finished,name,description,elapsed,scm_revision FROM default_table"
+ }
+ ]
+}
diff --git a/smardigo/backup/datasource/awx-job.json b/smardigo/backup/datasource/awx-job.json
new file mode 100644
index 0000000..153aefa
--- /dev/null
+++ b/smardigo/backup/datasource/awx-job.json
@@ -0,0 +1,18 @@
+{
+ "name": "awx-job",
+ "restApi": true,
+ "configKey": "awx-job",
+ "payloadType": "POST_PROCESSING",
+ "config": [
+ {
+ "name": "datasource_key",
+ "type": "STRING",
+ "value": "awx-job-plain"
+ },
+ {
+ "name": "groovy_script",
+ "type": "STRING",
+ "value": "def result = []\ndata.each{job ->\n if (parameters['stage']) {\n job.stage = parameters.stage\n }\n result.add(job)\n}\nresult"
+ }
+ ]
+}
diff --git a/smardigo/backup/form/current-jobs.json b/smardigo/backup/form/current-jobs.json
index fe718e9..316d687 100644
--- a/smardigo/backup/form/current-jobs.json
+++ b/smardigo/backup/form/current-jobs.json
@@ -36,7 +36,7 @@
"json" : ""
},
"data" : {
- "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job-plain/query?id={{ row }}",
+ "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job/query?id={{ row }}&stage={{ data.cluster.stage }}",
"method" : "GET",
"values" : [ { } ]
},
@@ -153,7 +153,7 @@
"tableView" : true,
"label" : "Column"
}, {
- "width" : 4,
+ "width" : 2,
"offset" : 0,
"push" : 0,
"pull" : 0,
@@ -201,6 +201,7 @@
}, {
"label" : "HTML",
"labelPosition" : "left-left",
+ "tag" : "div",
"className" : "pb-0",
"attrs" : [ {
"attr" : "",
@@ -232,6 +233,122 @@
"refreshOn" : "data",
"reorder" : false
} ]
+ }, {
+ "width" : 2,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ {
+ "label" : "Id",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "hidden" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "id",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "properties" : { },
+ "tags" : [ ],
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "customConditional" : "",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
+ "label" : "Stage",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "hidden" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "stage",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "properties" : { },
+ "tags" : [ ],
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "customConditional" : "",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
+ "label" : "HTML",
+ "labelPosition" : "left-left",
+ "tag" : "div",
+ "className" : "pb-0",
+ "attrs" : [ {
+ "attr" : "",
+ "value" : ""
+ } ],
+ "content" : "",
+ "refreshOnChange" : true,
+ "mask" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "htmlelement",
+ "input" : false,
+ "key" : "html2",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "",
+ "logic" : [ ],
+ "refreshOn" : "data",
+ "reorder" : false
+ } ]
} ],
"customClass" : "pb-0",
"mask" : false,
diff --git a/smardigo/pmci/datasource/awx-job-plain.json b/smardigo/pmci/datasource/awx-job-plain.json
index 00db778..7aed883 100644
--- a/smardigo/pmci/datasource/awx-job-plain.json
+++ b/smardigo/pmci/datasource/awx-job-plain.json
@@ -1,19 +1,23 @@
{
- "name" : "awx-job-plain",
- "restApi" : true,
- "configKey" : "awx-job-plain",
- "payloadType" : "REST",
- "config" : [ {
- "name" : "connection",
- "type" : "CONNECTION",
- "value" : "awx"
- }, {
- "name" : "resource",
- "type" : "STRING",
- "value" : "api/v2/jobs/${id}/"
- }, {
- "name" : "sqlStatement",
- "type" : "STRING",
- "value" : "SELECT status,failed,started,finished,name,description FROM default_table"
- } ]
-}
\ No newline at end of file
+ "name": "awx-job-plain",
+ "restApi": true,
+ "configKey": "awx-job-plain",
+ "payloadType": "REST",
+ "config": [
+ {
+ "name": "connection",
+ "type": "CONNECTION",
+ "value": "awx"
+ },
+ {
+ "name": "resource",
+ "type": "STRING",
+ "value": "api/v2/jobs/${id}/"
+ },
+ {
+ "name": "sqlStatement",
+ "type": "STRING",
+ "value": "SELECT id,status,failed,created,started,finished,name,description,elapsed,scm_revision FROM default_table"
+ }
+ ]
+}
diff --git a/smardigo/pmci/datasource/awx-job.json b/smardigo/pmci/datasource/awx-job.json
new file mode 100644
index 0000000..153aefa
--- /dev/null
+++ b/smardigo/pmci/datasource/awx-job.json
@@ -0,0 +1,18 @@
+{
+ "name": "awx-job",
+ "restApi": true,
+ "configKey": "awx-job",
+ "payloadType": "POST_PROCESSING",
+ "config": [
+ {
+ "name": "datasource_key",
+ "type": "STRING",
+ "value": "awx-job-plain"
+ },
+ {
+ "name": "groovy_script",
+ "type": "STRING",
+ "value": "def result = []\ndata.each{job ->\n if (parameters['stage']) {\n job.stage = parameters.stage\n }\n result.add(job)\n}\nresult"
+ }
+ ]
+}
diff --git a/smardigo/pmci/form/current-jobs.json b/smardigo/pmci/form/current-jobs.json
index fe718e9..316d687 100644
--- a/smardigo/pmci/form/current-jobs.json
+++ b/smardigo/pmci/form/current-jobs.json
@@ -36,7 +36,7 @@
"json" : ""
},
"data" : {
- "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job-plain/query?id={{ row }}",
+ "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job/query?id={{ row }}&stage={{ data.cluster.stage }}",
"method" : "GET",
"values" : [ { } ]
},
@@ -153,7 +153,7 @@
"tableView" : true,
"label" : "Column"
}, {
- "width" : 4,
+ "width" : 2,
"offset" : 0,
"push" : 0,
"pull" : 0,
@@ -201,6 +201,7 @@
}, {
"label" : "HTML",
"labelPosition" : "left-left",
+ "tag" : "div",
"className" : "pb-0",
"attrs" : [ {
"attr" : "",
@@ -232,6 +233,122 @@
"refreshOn" : "data",
"reorder" : false
} ]
+ }, {
+ "width" : 2,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ {
+ "label" : "Id",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "hidden" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "id",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "properties" : { },
+ "tags" : [ ],
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "customConditional" : "",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
+ "label" : "Stage",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "hidden" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "stage",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "properties" : { },
+ "tags" : [ ],
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "customConditional" : "",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
+ "label" : "HTML",
+ "labelPosition" : "left-left",
+ "tag" : "div",
+ "className" : "pb-0",
+ "attrs" : [ {
+ "attr" : "",
+ "value" : ""
+ } ],
+ "content" : "",
+ "refreshOnChange" : true,
+ "mask" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "htmlelement",
+ "input" : false,
+ "key" : "html2",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "",
+ "logic" : [ ],
+ "refreshOn" : "data",
+ "reorder" : false
+ } ]
} ],
"customClass" : "pb-0",
"mask" : false,
diff --git a/smardigo/provisioning/datasource/awx-job-plain.json b/smardigo/provisioning/datasource/awx-job-plain.json
index 00db778..7aed883 100644
--- a/smardigo/provisioning/datasource/awx-job-plain.json
+++ b/smardigo/provisioning/datasource/awx-job-plain.json
@@ -1,19 +1,23 @@
{
- "name" : "awx-job-plain",
- "restApi" : true,
- "configKey" : "awx-job-plain",
- "payloadType" : "REST",
- "config" : [ {
- "name" : "connection",
- "type" : "CONNECTION",
- "value" : "awx"
- }, {
- "name" : "resource",
- "type" : "STRING",
- "value" : "api/v2/jobs/${id}/"
- }, {
- "name" : "sqlStatement",
- "type" : "STRING",
- "value" : "SELECT status,failed,started,finished,name,description FROM default_table"
- } ]
-}
\ No newline at end of file
+ "name": "awx-job-plain",
+ "restApi": true,
+ "configKey": "awx-job-plain",
+ "payloadType": "REST",
+ "config": [
+ {
+ "name": "connection",
+ "type": "CONNECTION",
+ "value": "awx"
+ },
+ {
+ "name": "resource",
+ "type": "STRING",
+ "value": "api/v2/jobs/${id}/"
+ },
+ {
+ "name": "sqlStatement",
+ "type": "STRING",
+ "value": "SELECT id,status,failed,created,started,finished,name,description,elapsed,scm_revision FROM default_table"
+ }
+ ]
+}
diff --git a/smardigo/provisioning/datasource/awx-job.json b/smardigo/provisioning/datasource/awx-job.json
new file mode 100644
index 0000000..153aefa
--- /dev/null
+++ b/smardigo/provisioning/datasource/awx-job.json
@@ -0,0 +1,18 @@
+{
+ "name": "awx-job",
+ "restApi": true,
+ "configKey": "awx-job",
+ "payloadType": "POST_PROCESSING",
+ "config": [
+ {
+ "name": "datasource_key",
+ "type": "STRING",
+ "value": "awx-job-plain"
+ },
+ {
+ "name": "groovy_script",
+ "type": "STRING",
+ "value": "def result = []\ndata.each{job ->\n if (parameters['stage']) {\n job.stage = parameters.stage\n }\n result.add(job)\n}\nresult"
+ }
+ ]
+}
diff --git a/smardigo/provisioning/form/current-jobs.json b/smardigo/provisioning/form/current-jobs.json
index fe718e9..316d687 100644
--- a/smardigo/provisioning/form/current-jobs.json
+++ b/smardigo/provisioning/form/current-jobs.json
@@ -36,7 +36,7 @@
"json" : ""
},
"data" : {
- "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job-plain/query?id={{ row }}",
+ "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job/query?id={{ row }}&stage={{ data.cluster.stage }}",
"method" : "GET",
"values" : [ { } ]
},
@@ -153,7 +153,7 @@
"tableView" : true,
"label" : "Column"
}, {
- "width" : 4,
+ "width" : 2,
"offset" : 0,
"push" : 0,
"pull" : 0,
@@ -201,6 +201,7 @@
}, {
"label" : "HTML",
"labelPosition" : "left-left",
+ "tag" : "div",
"className" : "pb-0",
"attrs" : [ {
"attr" : "",
@@ -232,6 +233,122 @@
"refreshOn" : "data",
"reorder" : false
} ]
+ }, {
+ "width" : 2,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ {
+ "label" : "Id",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "hidden" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "id",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "properties" : { },
+ "tags" : [ ],
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "customConditional" : "",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
+ "label" : "Stage",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "allowMultipleMasks" : false,
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "clearOnHide" : false,
+ "hidden" : true,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "textfield",
+ "input" : true,
+ "key" : "stage",
+ "defaultValue" : "",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "properties" : { },
+ "tags" : [ ],
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "customConditional" : "",
+ "logic" : [ ],
+ "widget" : {
+ "type" : ""
+ },
+ "reorder" : false
+ }, {
+ "label" : "HTML",
+ "labelPosition" : "left-left",
+ "tag" : "div",
+ "className" : "pb-0",
+ "attrs" : [ {
+ "attr" : "",
+ "value" : ""
+ } ],
+ "content" : "",
+ "refreshOnChange" : true,
+ "mask" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "htmlelement",
+ "input" : false,
+ "key" : "html2",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "",
+ "logic" : [ ],
+ "refreshOn" : "data",
+ "reorder" : false
+ } ]
} ],
"customClass" : "pb-0",
"mask" : false,