Skip to content

use policy_id instead of id #470

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 6, 2023
Merged

use policy_id instead of id #470

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
2 changes: 1 addition & 1 deletion doc/simulation/local-policies/create_local_policies.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ begin
raise notice 'managedcluster name %', managed_cluster_name;
SELECT floor(random() * 2 + 1)::int into compliance_random_index;
foreach policy_id in array policy_ids loop
insert into local_status.compliance (id,cluster_id,cluster_name,leaf_hub_name,compliance,error) VALUES (policy_id,managed_cluster_id,managed_cluster_name,hub_name,all_compliances[compliance_random_index],'none');
insert into local_status.compliance (policy_id,cluster_id,cluster_name,leaf_hub_name,compliance,error) VALUES (policy_id,managed_cluster_id,managed_cluster_name,hub_name,all_compliances[compliance_random_index],'none');
end loop;
end loop;

Expand Down
8 changes: 4 additions & 4 deletions operator/pkg/controllers/hubofhubs/manifests/grafana/acm-global-offending-policies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ data:
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "WITH data AS (\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n ch.policy_id,\n COUNT(CASE WHEN compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\"\n FROM\n history.local_compliance ch\n WHERE\n $__timeFilter(ch.compliance_date)\n GROUP BY (ch.compliance_date, ch.policy_id)\n ORDER BY (ch.compliance_date) DESC\n),\nres as (\n SELECT\n id,\n SUM(non_compliant) as \"non_compliant\"\n FROM\n data\n GROUP BY (id)\n)\nSELECT\n COUNT(DISTINCT id)\nFROM\n res\nWHERE\n non_compliant > 0",
"rawSql": "WITH data AS (\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n ch.policy_id,\n COUNT(CASE WHEN compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\"\n FROM\n history.local_compliance ch\n WHERE\n $__timeFilter(ch.compliance_date)\n GROUP BY (ch.compliance_date, ch.policy_id)\n ORDER BY (ch.compliance_date) DESC\n),\nres as (\n SELECT\n policy_id,\n SUM(non_compliant) as \"non_compliant\"\n FROM\n data\n GROUP BY (policy_id)\n)\nSELECT\n COUNT(DISTINCT policy_id)\nFROM\n res\nWHERE\n non_compliant > 0",
"refId": "A",
"select": [
[
Expand Down Expand Up @@ -193,7 +193,7 @@ data:
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "WITH data AS (\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n ch.policy_id,\n COUNT(CASE WHEN compliance = 'compliant' THEN 1 END) AS \"compliant\",\n COUNT(CASE WHEN compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN compliance = 'unknown' THEN 1 END) AS \"unknown\"\n FROM\n history.local_compliance ch\n WHERE\n $__timeFilter(ch.compliance_date)\n GROUP BY (ch.compliance_date, ch.policy_id)\n ORDER BY (ch.compliance_date) DESC\n),\nres as (\n SELECT\n id,\n SUM(compliant) as \"compliant\",\n SUM(non_compliant) as \"non_compliant\",\n SUM(unknown) as \"unknown\"\n FROM\n data\n GROUP BY (id)\n)\nSELECT\n COUNT(DISTINCT id)\nFROM\n res\nWHERE\n compliant > 0\nAND\n non_compliant = 0\nAND\n unknown = 0",
"rawSql": "WITH data AS (\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n ch.policy_id,\n COUNT(CASE WHEN compliance = 'compliant' THEN 1 END) AS \"compliant\",\n COUNT(CASE WHEN compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN compliance = 'unknown' THEN 1 END) AS \"unknown\"\n FROM\n history.local_compliance ch\n WHERE\n $__timeFilter(ch.compliance_date)\n GROUP BY (ch.compliance_date, ch.policy_id)\n ORDER BY (ch.compliance_date) DESC\n),\nres as (\n SELECT\n policy_id,\n SUM(compliant) as \"compliant\",\n SUM(non_compliant) as \"non_compliant\",\n SUM(unknown) as \"unknown\"\n FROM\n data\n GROUP BY (policy_id)\n)\nSELECT\n COUNT(DISTINCT policy_id)\nFROM\n res\nWHERE\n compliant > 0\nAND\n non_compliant = 0\nAND\n unknown = 0",
"refId": "A",
"select": [
[
Expand Down Expand Up @@ -269,7 +269,7 @@ data:
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "WITH data AS (\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n ch.policy_id,\n COUNT(CASE WHEN compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN compliance = 'unknown' THEN 1 END) AS \"unknown\"\n FROM\n history.local_compliance ch\n WHERE\n $__timeFilter(ch.compliance_date)\n GROUP BY (ch.compliance_date, ch.policy_id)\n ORDER BY (ch.compliance_date) DESC\n),\nres as (\n SELECT\n id,\n SUM(non_compliant) as \"non_compliant\",\n SUM(unknown) as \"unknown\"\n FROM\n data\n GROUP BY (id)\n)\nSELECT\n COUNT(DISTINCT id)\nFROM\n res\nWHERE\n unknown > 0\nAND\n non_compliant = 0",
"rawSql": "WITH data AS (\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n ch.policy_id,\n COUNT(CASE WHEN compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN compliance = 'unknown' THEN 1 END) AS \"unknown\"\n FROM\n history.local_compliance ch\n WHERE\n $__timeFilter(ch.compliance_date)\n GROUP BY (ch.compliance_date, ch.policy_id)\n ORDER BY (ch.compliance_date) DESC\n),\nres as (\n SELECT\n policy_id,\n SUM(non_compliant) as \"non_compliant\",\n SUM(unknown) as \"unknown\"\n FROM\n data\n GROUP BY (policy_id)\n)\nSELECT\n COUNT(DISTINCT policy_id)\nFROM\n res\nWHERE\n unknown > 0\nAND\n non_compliant = 0",
"refId": "A",
"select": [
[
Expand Down Expand Up @@ -345,7 +345,7 @@ data:
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "WITH data AS (\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n ch.policy_id,\n COUNT(CASE WHEN compliance = 'compliant' THEN 1 END) AS \"compliant\",\n COUNT(CASE WHEN compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN compliance = 'unknown' THEN 1 END) AS \"unknown\"\n FROM\n history.local_compliance ch\n WHERE\n $__timeFilter(ch.compliance_date)\n GROUP BY (ch.compliance_date, ch.policy_id)\n ORDER BY (ch.compliance_date) DESC\n),\nres as (\n SELECT\n id,\n SUM(compliant) as \"compliant\",\n SUM(non_compliant) as \"non_compliant\",\n SUM(unknown) as \"unknown\"\n FROM\n data\n GROUP BY (id)\n)\nSELECT\n COUNT(DISTINCT id)\nFROM\n res",
"rawSql": "WITH data AS (\n SELECT\n $__timeGroupAlias(ch.compliance_date, $__interval),\n ch.policy_id,\n COUNT(CASE WHEN compliance = 'compliant' THEN 1 END) AS \"compliant\",\n COUNT(CASE WHEN compliance = 'non_compliant' THEN 1 END) AS \"non_compliant\",\n COUNT(CASE WHEN compliance = 'unknown' THEN 1 END) AS \"unknown\"\n FROM\n history.local_compliance ch\n WHERE\n $__timeFilter(ch.compliance_date)\n GROUP BY (ch.compliance_date, ch.policy_id)\n ORDER BY (ch.compliance_date) DESC\n),\nres as (\n SELECT\n policy_id,\n SUM(compliant) as \"compliant\",\n SUM(non_compliant) as \"non_compliant\",\n SUM(unknown) as \"unknown\"\n FROM\n data\n GROUP BY (policy_id)\n)\nSELECT\n COUNT(DISTINCT policy_id)\nFROM\n res",
"refId": "A",
"select": [
[
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/controllers/hubofhubs/manifests/grafana/acm-global-whats-changed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ data:
"group": [],
"metricColumn": "none",
"rawQuery": true,
"rawSql": "WITH data as (\n SELECT \n $__timeGroupAlias(ch.compliance_date, $__interval),\n mc.cluster_name AS \"metric\",\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 history.local_compliance ch\n INNER JOIN\n local_spec.policies p ON ch.id = p.policy_id\n INNER JOIN\n status.managed_clusters mc ON ch.cluster_id = mc.cluster_id\n WHERE\n $__timeFilter(ch.compliance_date)\n AND\n mc.cluster_name IN ($cluster)\n AND\n policy_name IN ($policy)\n GROUP BY (ch.compliance_date, mc.cluster_name)\n ORDER BY (time)\n)\nSELECT\n time,\n metric,\n compliant::float / NULLIF((compliant::float + non_compliant), 0) as \"value\"\nFROM\n data",
"rawSql": "WITH data as (\n SELECT \n $__timeGroupAlias(ch.compliance_date, $__interval),\n mc.cluster_name AS \"metric\",\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 history.local_compliance ch\n INNER JOIN\n local_spec.policies p ON ch.policy_id = p.policy_id\n INNER JOIN\n status.managed_clusters mc ON ch.cluster_id = mc.cluster_id\n WHERE\n $__timeFilter(ch.compliance_date)\n AND\n mc.cluster_name IN ($cluster)\n AND\n policy_name IN ($policy)\n GROUP BY (ch.compliance_date, mc.cluster_name)\n ORDER BY (time)\n)\nSELECT\n time,\n metric,\n compliant::float / NULLIF((compliant::float + non_compliant), 0) as \"value\"\nFROM\n data",
"refId": "A",
"select": [
[
Expand Down