Skip to content

Commit 73dbdcf

Browse files
author
github-actions
committed
Update perfectscale-prom-exporter chart with new package version v0.2.0
1 parent a9b2a06 commit 73dbdcf

File tree

2 files changed

+47
-22
lines changed

2 files changed

+47
-22
lines changed

‎charts/psc-prom-exporter/dashboards/grafana/workload-overview.json‎

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
"uid": "${DataSource}"
147147
},
148148
"editorMode": "code",
149-
"expr": "sum(ps_recommended_cpu_request_cores{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\"}) by (pod, container_name)",
149+
"expr": "sum(ps_recommended_cpu_request_cores{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", cluster_uid=~\"${cluster_uid}\"}) by (pod, container_name)",
150150
"hide": false,
151151
"instant": false,
152152
"legendFormat": "Recommendations Request: Pod: {{workload_name}} Container: {{container_name}}",
@@ -159,7 +159,7 @@
159159
"uid": "${DataSource}"
160160
},
161161
"editorMode": "code",
162-
"expr": "sum(ps_current_cpu_request_cores{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\"}) by (pod, container_name)",
162+
"expr": "sum(ps_current_cpu_request_cores{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", cluster_uid=~\"${cluster_uid}\"}) by (pod, container_name)",
163163
"hide": false,
164164
"instant": false,
165165
"legendFormat": "Current Request: Pod: {{workload_name}} Container: {{container_name}}",
@@ -261,7 +261,7 @@
261261
"uid": "${DataSource}"
262262
},
263263
"editorMode": "code",
264-
"expr": "sum(ps_recommended_cpu_limit_cores{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\"}) by (pod, container_name)",
264+
"expr": "sum(ps_recommended_cpu_limit_cores{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", cluster_uid=~\"${cluster_uid}\"}) by (pod, container_name)",
265265
"hide": false,
266266
"instant": false,
267267
"legendFormat": "Recommendations Limit: Pod: {{workload_name}} Container: {{container_name}}",
@@ -274,7 +274,7 @@
274274
"uid": "${DataSource}"
275275
},
276276
"editorMode": "code",
277-
"expr": "sum(ps_current_cpu_limit_cores{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\"}) by (pod, container_name)",
277+
"expr": "sum(ps_current_cpu_limit_cores{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", cluster_uid=~\"${cluster_uid}\"}) by (pod, container_name)",
278278
"hide": false,
279279
"instant": false,
280280
"legendFormat": "Current Limit: Pod: {{workload_name}} Container: {{container_name}}",
@@ -376,7 +376,7 @@
376376
"uid": "${DataSource}"
377377
},
378378
"editorMode": "code",
379-
"expr": "sum(ps_recommended_memory_request_bytes{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\"}) by (pod, container_name)",
379+
"expr": "sum(ps_recommended_memory_request_bytes{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", cluster_uid=~\"${cluster_uid}\"}) by (pod, container_name)",
380380
"hide": false,
381381
"instant": false,
382382
"legendFormat": "Recommendations Request: Pod: {{workload_name}} Container: {{container_name}}",
@@ -389,7 +389,7 @@
389389
"uid": "${DataSource}"
390390
},
391391
"editorMode": "code",
392-
"expr": "sum(ps_current_memory_request_bytes{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\"}) by (pod, container_name)",
392+
"expr": "sum(ps_current_memory_request_bytes{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", cluster_uid=~\"${cluster_uid}\"}) by (pod, container_name)",
393393
"hide": false,
394394
"instant": false,
395395
"legendFormat": "Current Request: Pod: {{workload_name}} Container: {{container_name}}",
@@ -491,7 +491,7 @@
491491
"uid": "${DataSource}"
492492
},
493493
"editorMode": "code",
494-
"expr": "sum(ps_recommended_memory_limit_bytes{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\"}) by (pod, container_name)",
494+
"expr": "sum(ps_recommended_memory_limit_bytes{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", cluster_uid=~\"${cluster_uid}\"}) by (pod, container_name)",
495495
"hide": false,
496496
"instant": false,
497497
"legendFormat": "Recommendations Limit: Pod: {{workload_name}} Container: {{container_name}}",
@@ -504,7 +504,7 @@
504504
"uid": "${DataSource}"
505505
},
506506
"editorMode": "code",
507-
"expr": "sum(ps_current_memory_limit_bytes{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\"}) by (pod, container_name)",
507+
"expr": "sum(ps_current_memory_limit_bytes{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", cluster_uid=~\"${cluster_uid}\"}) by (pod, container_name)",
508508
"hide": false,
509509
"instant": false,
510510
"legendFormat": "Current Limit: Pod: {{workload_name}} Container: {{container_name}}",
@@ -574,7 +574,7 @@
574574
"uid": "${DataSource}"
575575
},
576576
"editorMode": "code",
577-
"expr": "max(ps_replicas_avg{ps_namespace=~\"${namespace}\",workload_name=~\"${workload}\"})",
577+
"expr": "max(ps_replicas_avg{ps_namespace=~\"${namespace}\",workload_name=~\"${workload}\", cluster_uid=~\"${cluster_uid}\"})",
578578
"hide": false,
579579
"instant": false,
580580
"legendFormat": "Avg replicas count",
@@ -587,7 +587,7 @@
587587
"uid": "${DataSource}"
588588
},
589589
"editorMode": "code",
590-
"expr": "max(ps_replicas_max{ps_namespace=~\"${namespace}\",workload_name=~\"${workload}\"})",
590+
"expr": "max(ps_replicas_max{ps_namespace=~\"${namespace}\",workload_name=~\"${workload}\", cluster_uid=~\"${cluster_uid}\"})",
591591
"hide": false,
592592
"instant": false,
593593
"legendFormat": "Max replicas count",
@@ -689,7 +689,7 @@
689689
"uid": "${DataSource}"
690690
},
691691
"editorMode": "code",
692-
"expr": "sum(ps_waste_usd{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\"}) by (workload_name)",
692+
"expr": "sum(ps_waste_usd{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", cluster_uid=~\"${cluster_uid}\"}) by (workload_name)",
693693
"hide": false,
694694
"instant": false,
695695
"legendFormat": "Waste: {{workload_name}}",
@@ -702,7 +702,7 @@
702702
"uid": "${DataSource}"
703703
},
704704
"editorMode": "code",
705-
"expr": "sum(ps_cost_usd{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\"}) by (workload_name)",
705+
"expr": "sum(ps_cost_usd{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", cluster_uid=~\"${cluster_uid}\"}) by (workload_name)",
706706
"hide": false,
707707
"instant": false,
708708
"legendFormat": "Cost: {{workload_name}}",
@@ -804,7 +804,7 @@
804804
"uid": "${DataSource}"
805805
},
806806
"editorMode": "code",
807-
"expr": "sum(ps_workload_indicators{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", indicator_name!=\"\", indicator_level=~\"${indicator_level}\" }) by (indicator_name, indicator_level, container_name)",
807+
"expr": "sum(ps_workload_indicators{ps_namespace=~\"${namespace}\", workload_name=~\"${workload}\", ps_container_name=~\"${container}\", indicator_name!=\"\", indicator_level=~\"${indicator_level}\", cluster_uid=~\"${cluster_uid}\"}) by (indicator_name, indicator_level, container_name)",
808808
"hide": false,
809809
"instant": false,
810810
"legendFormat": "__auto",
@@ -837,13 +837,38 @@
837837
"type": "prometheus",
838838
"uid": "${DataSource}"
839839
},
840-
"definition": "label_values(ps_recommended_memory_request_bytes,ps_namespace)",
840+
"definition": "label_values(ps_cost_usd,cluster_uid)",
841+
"hide": 0,
842+
"includeAll": true,
843+
"allValue": ".*",
844+
"label": "Cluster UID",
845+
"multi": false,
846+
"name": "cluster_uid",
847+
"options": [],
848+
"query": {
849+
"qryType": 1,
850+
"query": "label_values(ps_cost_usd,cluster_uid)",
851+
"refId": "PrometheusVariableQueryEditor-VariableQuery"
852+
},
853+
"refresh": 2,
854+
"regex": "",
855+
"skipUrlSync": false,
856+
"sort": 0,
857+
"type": "query"
858+
},
859+
{
860+
"current": {},
861+
"datasource": {
862+
"type": "prometheus",
863+
"uid": "${DataSource}"
864+
},
865+
"definition": "label_values(ps_recommended_memory_request_bytes{cluster_uid=~\"$cluster_uid\"},ps_namespace)",
841866
"includeAll": false,
842867
"label": "Namespace",
843868
"name": "namespace",
844869
"options": [],
845870
"query": {
846-
"query": "label_values(ps_recommended_memory_request_bytes,ps_namespace)",
871+
"query": "label_values(ps_recommended_memory_request_bytes{cluster_uid=~\"$cluster_uid\"},ps_namespace)",
847872
"refId": "PrometheusVariableQueryEditor-VariableQuery"
848873
},
849874
"refresh": 2,
@@ -857,14 +882,14 @@
857882
"type": "prometheus",
858883
"uid": "${DataSource}"
859884
},
860-
"definition": "label_values(ps_recommended_memory_request_bytes{ps_namespace=~\"$namespace\"},workload_name)",
885+
"definition": "label_values(ps_recommended_memory_request_bytes{ps_namespace=~\"$namespace\", cluster_uid=~\"$cluster_uid\"},workload_name)",
861886
"includeAll": false,
862887
"label": "Workload",
863888
"name": "workload",
864889
"options": [],
865890
"query": {
866891
"qryType": 1,
867-
"query": "label_values(ps_recommended_memory_request_bytes{ps_namespace=~\"$namespace\"},workload_name)",
892+
"query": "label_values(ps_recommended_memory_request_bytes{ps_namespace=~\"$namespace\", cluster_uid=~\"$cluster_uid\"},workload_name)",
868893
"refId": "PrometheusVariableQueryEditor-VariableQuery"
869894
},
870895
"refresh": 2,
@@ -878,14 +903,14 @@
878903
"type": "prometheus",
879904
"uid": "${DataSource}"
880905
},
881-
"definition": "label_values(ps_recommended_memory_request_bytes{ps_namespace=~\"$namespace\", workload_name=\"$workload\"},ps_container_name)",
906+
"definition": "label_values(ps_recommended_memory_request_bytes{ps_namespace=~\"$namespace\", workload_name=\"$workload\", cluster_uid=~\"$cluster_uid\"},ps_container_name)",
882907
"includeAll": false,
883908
"label": "Container",
884909
"name": "container",
885910
"options": [],
886911
"query": {
887912
"qryType": 1,
888-
"query": "label_values(ps_recommended_memory_request_bytes{ps_namespace=~\"$namespace\", workload_name=\"$workload\"},ps_container_name)",
913+
"query": "label_values(ps_recommended_memory_request_bytes{ps_namespace=~\"$namespace\", workload_name=\"$workload\", cluster_uid=~\"$cluster_uid\"},ps_container_name)",
889914
"refId": "PrometheusVariableQueryEditor-VariableQuery"
890915
},
891916
"refresh": 2,
@@ -899,14 +924,14 @@
899924
"type": "prometheus",
900925
"uid": "${DataSource}"
901926
},
902-
"definition": "label_values(ps_workload_indicators{ps_namespace=~\"$namespace\", workload_name=\"$workload\", ps_container_name=\"$container\"},indicator_level)",
927+
"definition": "label_values(ps_workload_indicators{ps_namespace=~\"$namespace\", workload_name=\"$workload\", ps_container_name=\"$container\", cluster_uid=~\"$cluster_uid\"},indicator_level)",
903928
"includeAll": true,
904929
"label": "Indicator level",
905930
"multi": true,
906931
"name": "indicator_level",
907932
"options": [],
908933
"query": {
909-
"query": "label_values(ps_workload_indicators{ps_namespace=~\"$namespace\", workload_name=\"$workload\", ps_container_name=\"$container\"},indicator_level)",
934+
"query": "label_values(ps_workload_indicators{ps_namespace=~\"$namespace\", workload_name=\"$workload\", ps_container_name=\"$container\", cluster_uid=~\"$cluster_uid\"},indicator_level)",
910935
"refId": "PrometheusVariableQueryEditor-VariableQuery"
911936
},
912937
"refresh": 2,

‎charts/psc-prom-exporter/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ replicaCount: 1
22
image:
33
repository: public.ecr.aws/perfectscale-io/psc-prom-exporter
44
pullPolicy: Always
5-
tag: "v0.1.1"
5+
tag: "v0.2.0"
66
settings:
77
deployKubeStateMetrics: true
88
serviceId: "psc-prom-exporter"

0 commit comments

Comments
 (0)