Skip to content

fix policy compliancy overview and some performance issue #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 8, 2023
Merged

fix policy compliancy overview and some performance issue #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...controllers/hubofhubs/manifests/grafana/acm-global-cluster-group-compliancy-overview.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ data:
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1685724016420,
"iteration": 1686202244314,
"links": [
{
"asDropdown": false,
Expand Down Expand Up @@ -126,7 +126,7 @@ data:
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "WITH data as (\n WITH all_managed_clusters as(\n SELECT * FROM status.managed_clusters\n UNION \n SELECT * FROM history.managed_clusters\n )\n SELECT\n ch.compliance_date as \"time\",\n payload -> 'metadata' -> 'labels' ->> '$label' AS \"$label\",\n COUNT(CASE WHEN ch.compliance = 'compliant' THEN 1 END) AS \"compliant\",\n COUNT(CASE WHEN ch.compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN ch.compliance = 'unknown' THEN 1 END) AS \"unknown\"\n FROM\n all_managed_clusters mc\n JOIN\n history.local_compliance ch ON mc.cluster_id = ch.cluster_id\n WHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IN ($value)\n GROUP BY (ch.compliance_date, mc.payload -> 'metadata' -> 'labels' ->> '$label')\n ORDER BY (ch.compliance_date)\n)\nSELECT\n time,\n $label as \"metric\",\n compliant::float / NULLIF((compliant::float + non_compliant + unknown), 0) as \"value\"\nFROM\n data\nORDER BY (time)",
"rawSql": "WITH data as (\n WITH all_managed_clusters as(\n SELECT * FROM status.managed_clusters\n UNION \n SELECT * FROM history.managed_clusters\n )\n SELECT\n ch.compliance_date as \"time\",\n payload -> 'metadata' -> 'labels' ->> '$label' AS \"$label\",\n COUNT(CASE WHEN ch.compliance = 'compliant' THEN 1 END) AS \"compliant\",\n COUNT(CASE WHEN ch.compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN ch.compliance = 'unknown' THEN 1 END) AS \"unknown\"\n FROM\n all_managed_clusters mc\n JOIN\n history.local_compliance ch ON mc.cluster_id = ch.cluster_id\n WHERE\n $__timeFilter(ch.compliance_date)\n AND\n payload -> 'metadata' -> 'labels' ->> '$label' IN ($value)\n GROUP BY (ch.compliance_date, mc.payload -> 'metadata' -> 'labels' ->> '$label')\n ORDER BY (ch.compliance_date)\n)\nSELECT\n time,\n $label as \"metric\",\n compliant::float / NULLIF((compliant::float + non_compliant + unknown), 0) as \"value\"\nFROM\n data\nORDER BY (time)",
"refId": "A",
"select": [
[
Expand Down Expand Up @@ -187,7 +187,7 @@ data:
"value": "vendor"
},
"datasource": "${datasource}",
"definition": "SELECT\n DISTINCT jsonb_object_keys(payload -> 'metadata' -> 'labels')\nFROM\n status.managed_clusters",
"definition": "SELECT\n DISTINCT jsonb_object_keys(payload -> 'metadata' -> 'labels')\nFROM\n status.managed_clusters mc \nJOIN\n history.local_compliance ch \nON\n mc.cluster_id = ch.cluster_id",
"description": "Managed cluster labels",
"error": null,
"hide": 0,
Expand All @@ -196,7 +196,7 @@ data:
"multi": false,
"name": "label",
"options": [],
"query": "SELECT\n DISTINCT jsonb_object_keys(payload -> 'metadata' -> 'labels')\nFROM\n status.managed_clusters",
"query": "SELECT\n DISTINCT jsonb_object_keys(payload -> 'metadata' -> 'labels')\nFROM\n status.managed_clusters mc \nJOIN\n history.local_compliance ch \nON\n mc.cluster_id = ch.cluster_id",
"refresh": 1,
"regex": "/^[a-z]+$/",
"skipUrlSync": false,
Expand All @@ -215,7 +215,7 @@ data:
]
},
"datasource": "${datasource}",
"definition": "SELECT\n payload -> 'metadata' -> 'labels' ->> '$label'\nFROM\n status.managed_clusters\nWHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IS NOT NULL",
"definition": "SELECT\n payload -> 'metadata' -> 'labels' ->> '$label'\nFROM\n status.managed_clusters mc\nJOIN\n history.local_compliance ch \nON\n mc.cluster_id = ch.cluster_id\nWHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IS NOT NULL",
"description": "Managed clusters label values",
"error": null,
"hide": 0,
Expand All @@ -224,7 +224,7 @@ data:
"multi": true,
"name": "value",
"options": [],
"query": "SELECT\n payload -> 'metadata' -> 'labels' ->> '$label'\nFROM\n status.managed_clusters\nWHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IS NOT NULL",
"query": "SELECT\n payload -> 'metadata' -> 'labels' ->> '$label'\nFROM\n status.managed_clusters mc\nJOIN\n history.local_compliance ch \nON\n mc.cluster_id = ch.cluster_id\nWHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IS NOT NULL",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand Down
28 changes: 10 additions & 18 deletions operator/pkg/controllers/hubofhubs/manifests/grafana/acm-global-offending-clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ data:
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1685728160463,
"iteration": 1686213056442,
"links": [
{
"asDropdown": false,
Expand Down Expand Up @@ -400,17 +400,9 @@ data:
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "dark-yellow",
"value": null
},
{
"color": "green",
"value": 0
},
{
"color": "red",
"value": 0.01
"value": null
}
]
},
Expand Down Expand Up @@ -467,7 +459,7 @@ data:
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "WITH data AS (\n WITH all_managed_clusters as(\n SELECT * FROM status.managed_clusters\n UNION \n SELECT * FROM history.managed_clusters\n )\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n mc.cluster_name as \"cluster\",\n mc.leaf_hub_name as \"hub\",\n mc.payload -> 'metadata' -> 'labels' ->> '$label' AS \"$label\",\n COUNT(CASE WHEN ch.compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN ch.compliance = 'compliant' THEN 1 END) AS \"compliant\"\n FROM\n all_managed_clusters mc\n JOIN\n history.local_compliance ch ON mc.cluster_id = ch.cluster_id\n WHERE\n $__timeFilter(ch.compliance_date)\n AND\n mc.payload -> 'metadata' -> 'labels' ->> '$label' IN ($value) \n GROUP BY (ch.compliance_date, mc.cluster_name, mc.leaf_hub_name, mc.payload)\n ORDER BY (ch.compliance_date) DESC\n),\nres AS (\n SELECT\n time,\n cluster,\n hub,\n $label,\n non_compliant::float / NULLIF((compliant::float + non_compliant), 0) as \"value\" \n FROM\n data\n)\nSELECT\n *\nFROM\n res\nWHERE\n value > 0\nORDER BY (time, \"value\") DESC",
"rawSql": "WITH data AS (\n WITH all_managed_clusters as(\n SELECT * FROM status.managed_clusters\n UNION \n SELECT * FROM history.managed_clusters\n )\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n mc.cluster_name as \"cluster\",\n mc.leaf_hub_name as \"hub\",\n mc.payload -> 'metadata' -> 'labels' ->> '$label' AS \"$label\",\n COUNT(CASE WHEN ch.compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN ch.compliance = 'unknown' THEN 1 END) AS \"unknown\",\n COUNT(CASE WHEN ch.compliance = 'compliant' THEN 1 END) AS \"compliant\"\n FROM\n all_managed_clusters mc\n JOIN\n history.local_compliance ch ON mc.cluster_id = ch.cluster_id\n WHERE\n $__timeFilter(ch.compliance_date)\n AND\n mc.payload -> 'metadata' -> 'labels' ->> '$label' IN ($value)\n GROUP BY (ch.compliance_date, mc.cluster_name, mc.leaf_hub_name, mc.payload)\n ORDER BY (ch.compliance_date) DESC\n),\nres AS (\n SELECT\n time,\n cluster,\n hub,\n $label,\n non_compliant::float / NULLIF((compliant::float + unknown + non_compliant), 0) as \"value\" \n FROM\n data\n WHERE\n non_compliant > 0\n)\nSELECT\n *\nFROM\n res\nORDER BY (time, value) DESC",
"refId": "A",
"select": [
[
Expand Down Expand Up @@ -539,7 +531,7 @@ data:
"mode": "absolute",
"steps": [
{
"color": "dark-yellow",
"color": "yellow",
"value": null
}
]
Expand Down Expand Up @@ -582,7 +574,7 @@ data:
"options": {
"match": "null+nan",
"result": {
"color": "dark-yellow",
"color": "yellow",
"index": 0,
"text": "Unknown"
}
Expand Down Expand Up @@ -613,7 +605,7 @@ data:
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "WITH data AS (\n WITH all_managed_clusters as(\n SELECT * FROM status.managed_clusters\n UNION \n SELECT * FROM history.managed_clusters\n )\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n mc.cluster_name as \"cluster\",\n mc.leaf_hub_name as \"hub\",\n mc.payload -> 'metadata' -> 'labels' ->> '$label' AS \"$label\",\n COUNT(CASE WHEN ch.compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN ch.compliance = 'compliant' THEN 1 END) AS \"compliant\"\n FROM\n all_managed_clusters mc\n JOIN\n history.local_compliance ch ON mc.cluster_id = ch.cluster_id\n WHERE\n $__timeFilter(ch.compliance_date)\n AND\n mc.payload -> 'metadata' -> 'labels' ->> '$label' IN ($value) \n GROUP BY (ch.compliance_date, mc.cluster_name, mc.leaf_hub_name, mc.payload)\n ORDER BY (ch.compliance_date) DESC\n),\nres AS (\n SELECT\n time,\n cluster,\n hub,\n $label,\n non_compliant::float / NULLIF((compliant::float + non_compliant), 0) as \"value\" \n FROM\n data\n)\nSELECT\n *\nFROM\n res\nWHERE\n value IS NULL\nORDER BY (\"value\") DESC",
"rawSql": "WITH data AS (\n WITH all_managed_clusters as(\n SELECT * FROM status.managed_clusters\n UNION \n SELECT * FROM history.managed_clusters\n )\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n mc.cluster_name as \"cluster\",\n mc.leaf_hub_name as \"hub\",\n mc.payload -> 'metadata' -> 'labels' ->> '$label' AS \"$label\",\n COUNT(CASE WHEN ch.compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN ch.compliance = 'unknown' THEN 1 END) AS \"unknown\",\n COUNT(CASE WHEN ch.compliance = 'compliant' THEN 1 END) AS \"compliant\"\n FROM\n all_managed_clusters mc\n JOIN\n history.local_compliance ch ON mc.cluster_id = ch.cluster_id\n WHERE\n $__timeFilter(ch.compliance_date)\n AND\n mc.payload -> 'metadata' -> 'labels' ->> '$label' IN ($value) \n GROUP BY (ch.compliance_date, mc.cluster_name, mc.leaf_hub_name, mc.payload)\n ORDER BY (ch.compliance_date) DESC\n),\nres AS (\n SELECT\n time,\n cluster,\n hub,\n $label,\n unknown::float / NULLIF((compliant::float + unknown + non_compliant), 0) as \"value\" \n FROM\n data\n WHERE\n non_compliant = 0\n AND\n unknown > 0\n)\nSELECT\n *\nFROM\n res\nORDER BY (value) DESC",
"refId": "A",
"select": [
[
Expand Down Expand Up @@ -695,7 +687,7 @@ data:
"value": "vendor"
},
"datasource": "${datasource}",
"definition": "SELECT\n DISTINCT jsonb_object_keys(payload -> 'metadata' -> 'labels')\nFROM\n status.managed_clusters",
"definition": "SELECT\n DISTINCT jsonb_object_keys(payload -> 'metadata' -> 'labels')\nFROM\n status.managed_clusters mc\nJOIN\n history.local_compliance ch \nON\n mc.cluster_id = ch.cluster_id",
"description": "Managed cluster labels",
"error": null,
"hide": 0,
Expand All @@ -704,7 +696,7 @@ data:
"multi": false,
"name": "label",
"options": [],
"query": "SELECT\n DISTINCT jsonb_object_keys(payload -> 'metadata' -> 'labels')\nFROM\n status.managed_clusters",
"query": "SELECT\n DISTINCT jsonb_object_keys(payload -> 'metadata' -> 'labels')\nFROM\n status.managed_clusters mc\nJOIN\n history.local_compliance ch \nON\n mc.cluster_id = ch.cluster_id",
"refresh": 1,
"regex": "/^[a-z]+$/",
"skipUrlSync": false,
Expand All @@ -723,7 +715,7 @@ data:
]
},
"datasource": "${datasource}",
"definition": "SELECT\n payload -> 'metadata' -> 'labels' ->> '$label'\nFROM\n status.managed_clusters\nWHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IS NOT NULL",
"definition": "SELECT\n payload -> 'metadata' -> 'labels' ->> '$label'\nFROM\n status.managed_clusters mc \nJOIN\n history.local_compliance ch \nON\n mc.cluster_id = ch.cluster_id\nWHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IS NOT NULL",
"description": "Managed cluster label values",
"error": null,
"hide": 0,
Expand All @@ -732,7 +724,7 @@ data:
"multi": true,
"name": "value",
"options": [],
"query": "SELECT\n payload -> 'metadata' -> 'labels' ->> '$label'\nFROM\n status.managed_clusters\nWHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IS NOT NULL",
"query": "SELECT\n payload -> 'metadata' -> 'labels' ->> '$label'\nFROM\n status.managed_clusters mc \nJOIN\n history.local_compliance ch \nON\n mc.cluster_id = ch.cluster_id\nWHERE\n payload -> 'metadata' -> 'labels' ->> '$label' IS NOT NULL",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand Down
Loading