Skip to content

Commit 3087108

Browse files
authored
fix for the cpu/memory request_hard data (#2027)
Signed-off-by: Raj Zalavadia <[email protected]>
1 parent 9ec9135 commit 3087108

File tree

1 file changed

+57
-109
lines changed

1 file changed

+57
-109
lines changed

operators/multiclusterobservability/manifests/base/grafana/analytics/dash-acm-right-sizing-namespace.yaml

Lines changed: 57 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,32 @@ data:
785785
{
786786
"id": "decimals",
787787
"value": 2
788+
},
789+
{
790+
"id": "mappings",
791+
"value": [
792+
{
793+
"options": {
794+
"from": 1e-8,
795+
"result": {
796+
"index": 0,
797+
"text": "0.01"
798+
},
799+
"to": 0.00999999
800+
},
801+
"type": "range"
802+
},
803+
{
804+
"options": {
805+
"match": "null",
806+
"result": {
807+
"index": 1,
808+
"text": "N/A"
809+
}
810+
},
811+
"type": "special"
812+
}
813+
]
788814
}
789815
]
790816
}
@@ -880,7 +906,7 @@ data:
880906
},
881907
"editorMode": "code",
882908
"exemplar": false,
883-
"expr": "max_over_time(sum by (namespace) (acm_rs:namespace:cpu_request_hard{profile=\"$profile\"})[$days:])",
909+
"expr": "max_over_time(sum by (namespace) (acm_rs:namespace:cpu_request_hard{cluster=\"$cluster\", profile=\"$profile\"})[$days:])",
884910
"format": "table",
885911
"hide": false,
886912
"instant": true,
@@ -913,60 +939,6 @@ data:
913939
"byField": "namespace"
914940
}
915941
},
916-
{
917-
"id": "filterByValue",
918-
"options": {
919-
"filters": [
920-
{
921-
"config": {
922-
"id": "equal",
923-
"options": {
924-
"value": "test-mem-usage"
925-
}
926-
},
927-
"fieldName": "namespace"
928-
},
929-
{
930-
"config": {
931-
"id": "equal",
932-
"options": {
933-
"value": "test-mem-usage-1"
934-
}
935-
},
936-
"fieldName": "namespace"
937-
},
938-
{
939-
"config": {
940-
"id": "equal",
941-
"options": {
942-
"value": "test-mem-usage-2"
943-
}
944-
},
945-
"fieldName": "namespace"
946-
},
947-
{
948-
"config": {
949-
"id": "equal",
950-
"options": {
951-
"value": "test-cpu-usage-1"
952-
}
953-
},
954-
"fieldName": "namespace"
955-
},
956-
{
957-
"config": {
958-
"id": "equal",
959-
"options": {
960-
"value": "test-cpu-usage-2"
961-
}
962-
},
963-
"fieldName": "namespace"
964-
}
965-
],
966-
"match": "any",
967-
"type": "exclude"
968-
}
969-
},
970942
{
971943
"id": "sortBy",
972944
"options": {
@@ -1722,6 +1694,36 @@ data:
17221694
{
17231695
"id": "decimals",
17241696
"value": 2
1697+
},
1698+
{
1699+
"id": "custom.align",
1700+
"value": "left"
1701+
},
1702+
{
1703+
"id": "mappings",
1704+
"value": [
1705+
{
1706+
"options": {
1707+
"from": 1e-8,
1708+
"result": {
1709+
"index": 1,
1710+
"text": "0.01"
1711+
},
1712+
"to": 0.00999999
1713+
},
1714+
"type": "range"
1715+
},
1716+
{
1717+
"options": {
1718+
"match": "null",
1719+
"result": {
1720+
"index": 2,
1721+
"text": "N/A"
1722+
}
1723+
},
1724+
"type": "special"
1725+
}
1726+
]
17251727
}
17261728
]
17271729
}
@@ -1850,60 +1852,6 @@ data:
18501852
"byField": "namespace"
18511853
}
18521854
},
1853-
{
1854-
"id": "filterByValue",
1855-
"options": {
1856-
"filters": [
1857-
{
1858-
"config": {
1859-
"id": "equal",
1860-
"options": {
1861-
"value": "test-cpu-usage-2"
1862-
}
1863-
},
1864-
"fieldName": "namespace"
1865-
},
1866-
{
1867-
"config": {
1868-
"id": "equal",
1869-
"options": {
1870-
"value": "test-cpu-usage-1"
1871-
}
1872-
},
1873-
"fieldName": "namespace"
1874-
},
1875-
{
1876-
"config": {
1877-
"id": "equal",
1878-
"options": {
1879-
"value": "test-mem-usage-2"
1880-
}
1881-
},
1882-
"fieldName": "namespace"
1883-
},
1884-
{
1885-
"config": {
1886-
"id": "equal",
1887-
"options": {
1888-
"value": "test-mem-usage-1"
1889-
}
1890-
},
1891-
"fieldName": "namespace"
1892-
},
1893-
{
1894-
"config": {
1895-
"id": "equal",
1896-
"options": {
1897-
"value": "test-mem-usage"
1898-
}
1899-
},
1900-
"fieldName": "namespace"
1901-
}
1902-
],
1903-
"match": "any",
1904-
"type": "exclude"
1905-
}
1906-
},
19071855
{
19081856
"id": "sortBy",
19091857
"options": {

0 commit comments

Comments
 (0)