From 7c8c060a4d7d08ff944c8490f087e35ed69ddec4 Mon Sep 17 00:00:00 2001
From: Hardikl <83282894+Hardikl@users.noreply.github.com>
Date: Mon, 11 Jul 2022 22:37:49 +0530
Subject: [PATCH] fix: dashboard changes for light theme (#1127)
* fix: dashboard changes for light theme
---
.../cmode/harvest_dashboard_compliance.json | 123 ++++++------------
.../cmode/harvest_dashboard_security.json | 6 +-
2 files changed, 45 insertions(+), 84 deletions(-)
diff --git a/grafana/dashboards/cmode/harvest_dashboard_compliance.json b/grafana/dashboards/cmode/harvest_dashboard_compliance.json
index 98e808584..66cf15776 100644
--- a/grafana/dashboards/cmode/harvest_dashboard_compliance.json
+++ b/grafana/dashboards/cmode/harvest_dashboard_compliance.json
@@ -483,7 +483,7 @@
},
{
"datasource": "Prometheus",
- "description": "Green means this attribute is compliant
\nOrange is non compliant",
+ "description": "❌ means this attribute is non-compliant",
"fieldConfig": {
"defaults": {
"color": {
@@ -492,7 +492,7 @@
},
"custom": {
"align": "left",
- "displayMode": "color-background-solid",
+ "displayMode": "auto",
"filterable": false
},
"mappings": [],
@@ -519,12 +519,10 @@
{
"options": {
"false": {
- "color": "semi-dark-orange",
"index": 0,
- "text": "Disabled"
+ "text": "❌ Disabled"
},
"true": {
- "color": "semi-dark-green",
"index": 1,
"text": "Enabled"
}
@@ -555,14 +553,12 @@
{
"options": {
"false": {
- "color": "semi-dark-green",
"index": 0,
"text": "Disabled"
},
"true": {
- "color": "semi-dark-orange",
"index": 1,
- "text": "Enabled"
+ "text": "❌ Enabled"
}
},
"type": "value"
@@ -591,7 +587,6 @@
{
"options": {
"0": {
- "color": "semi-dark-green",
"index": 1,
"text": "No"
}
@@ -602,7 +597,6 @@
"options": {
"match": "null",
"result": {
- "color": "semi-dark-green",
"index": 0,
"text": "No"
}
@@ -613,9 +607,8 @@
"options": {
"from": 1,
"result": {
- "color": "semi-dark-orange",
"index": 2,
- "text": "Yes"
+ "text": "❌ Yes"
},
"to": 99999999
},
@@ -645,14 +638,12 @@
{
"options": {
"false": {
- "color": "semi-dark-green",
"index": 0,
"text": "Disabled"
},
"true": {
- "color": "semi-dark-orange",
"index": 1,
- "text": "Enabled"
+ "text": "❌ Enabled"
}
},
"type": "value"
@@ -661,7 +652,6 @@
"options": {
"match": "empty",
"result": {
- "color": "semi-dark-green",
"index": 2,
"text": "Disabled"
}
@@ -672,7 +662,6 @@
"options": {
"match": "null",
"result": {
- "color": "semi-dark-green",
"index": 3,
"text": "Disabled"
}
@@ -703,14 +692,12 @@
{
"options": {
"false": {
- "color": "semi-dark-green",
"index": 0,
"text": "Disabled"
},
"true": {
- "color": "semi-dark-orange",
"index": 1,
- "text": "Enabled"
+ "text": "❌ Enabled"
}
},
"type": "value"
@@ -719,7 +706,6 @@
"options": {
"match": "null",
"result": {
- "color": "semi-dark-green",
"index": 2,
"text": "Disabled"
}
@@ -730,7 +716,6 @@
"options": {
"match": "empty",
"result": {
- "color": "semi-dark-green",
"index": 3,
"text": "Disabled"
}
@@ -761,12 +746,10 @@
{
"options": {
"false": {
- "color": "semi-dark-orange",
"index": 0,
- "text": "Disabled"
+ "text": "❌ Disabled"
},
"true": {
- "color": "semi-dark-green",
"index": 1,
"text": "Enabled"
}
@@ -777,9 +760,8 @@
"options": {
"match": "null",
"result": {
- "color": "semi-dark-orange",
"index": 2,
- "text": "Disabled"
+ "text": "❌ Disabled"
}
},
"type": "special"
@@ -808,7 +790,6 @@
{
"options": {
" ": {
- "color": "semi-dark-green",
"index": 0,
"text": "No"
}
@@ -819,9 +800,8 @@
"options": {
"match": "nan",
"result": {
- "color": "semi-dark-orange",
"index": 1,
- "text": "Yes"
+ "text": "❌ Yes"
}
},
"type": "special"
@@ -851,9 +831,8 @@
"options": {
"match": "empty",
"result": {
- "color": "semi-dark-orange",
"index": 0,
- "text": "Disabled"
+ "text": "❌ Disabled"
}
},
"type": "special"
@@ -862,7 +841,6 @@
"options": {
"match": "nan",
"result": {
- "color": "semi-dark-green",
"index": 1,
"text": "Enabled"
}
@@ -893,33 +871,40 @@
{
"options": {
"0": {
- "color": "semi-dark-orange",
"index": 0,
- "text": "Not Configured"
+ "text": "❌ Not Configured"
},
"1": {
- "color": "semi-dark-orange",
"index": 1,
- "text": "1 out of 3"
+ "text": "❌ 1 out of 3"
},
"2": {
- "color": "semi-dark-orange",
"index": 2,
- "text": "2 out of 3"
- },
- "3": {
- "color": "semi-dark-green",
- "index": 3,
- "text": "Configured"
+ "text": "❌ 2 out of 3"
}
},
"type": "value"
+ },
+ {
+ "type": "range",
+ "options": {
+ "from": 3,
+ "to": 9999,
+ "result": {
+ "text": "Configured",
+ "index": 3
+ }
+ }
}
]
},
{
"id": "custom.width",
"value": 169
+ },
+ {
+ "id": "custom.filterable",
+ "value": true
}
]
},
@@ -1027,7 +1012,6 @@
"options": {
"from": 1,
"result": {
- "color": "semi-dark-green",
"index": 1,
"text": "Configured"
},
@@ -1110,7 +1094,6 @@
"options": {
"from": 1,
"result": {
- "color": "semi-dark-green",
"index": 1,
"text": "Configured"
},
@@ -1142,7 +1125,6 @@
{
"options": {
"0": {
- "color": "semi-dark-green",
"index": 1,
"text": "Encrypted"
}
@@ -1163,9 +1145,8 @@
"options": {
"from": 1,
"result": {
- "color": "semi-dark-orange",
"index": 2,
- "text": "Not Encrypted"
+ "text": "❌ Not Encrypted"
},
"to": 9999999999
},
@@ -1199,17 +1180,14 @@
{
"options": {
"active": {
- "color": "semi-dark-green",
"index": 0,
"text": "Active"
},
"expired": {
- "color": "semi-dark-orange",
"index": 2,
- "text": "Expired"
+ "text": "❌ Expired"
},
"expiring": {
- "color": "semi-dark-green",
"index": 1,
"text": "Active (Expiring < 60 days)"
},
@@ -1303,8 +1281,7 @@
"type": "value",
"options": {
"1": {
- "text": "No",
- "color": "semi-dark-orange",
+ "text": "❌ No",
"index": 0
}
}
@@ -1315,7 +1292,6 @@
"match": "null",
"result": {
"text": "Yes",
- "color": "semi-dark-green",
"index": 1
}
}
@@ -1980,7 +1956,7 @@
},
{
"datasource": "Prometheus",
- "description": "Green means this attribute is compliant
\nOrange is non compliant",
+ "description": "❌ means this attribute is non-compliant",
"fieldConfig": {
"defaults": {
"color": {
@@ -1989,7 +1965,7 @@
},
"custom": {
"align": "left",
- "displayMode": "color-background-solid",
+ "displayMode": "auto",
"filterable": false
},
"mappings": [],
@@ -2033,9 +2009,8 @@
"options": {
"match": "empty",
"result": {
- "color": "semi-dark-orange",
"index": 0,
- "text": "Disabled"
+ "text": "❌ Disabled"
}
},
"type": "special"
@@ -2044,9 +2019,8 @@
"options": {
"match": "null",
"result": {
- "color": "semi-dark-orange",
"index": 1,
- "text": "Disabled"
+ "text": "❌ Disabled"
}
},
"type": "special"
@@ -2055,7 +2029,6 @@
"options": {
"match": "nan",
"result": {
- "color": "semi-dark-green",
"index": 2,
"text": "Enabled"
}
@@ -2082,12 +2055,10 @@
{
"options": {
"false": {
- "color": "semi-dark-orange",
"index": 1,
- "text": "Disabled"
+ "text": "❌ Disabled"
},
"true": {
- "color": "semi-dark-green",
"index": 0,
"text": "Enabled"
}
@@ -2154,7 +2125,6 @@
{
"options": {
" ": {
- "color": "semi-dark-green",
"index": 1,
"text": "No"
}
@@ -2165,9 +2135,8 @@
"options": {
"match": "nan",
"result": {
- "color": "semi-dark-orange",
"index": 0,
- "text": "Yes"
+ "text": "❌ Yes"
}
},
"type": "special"
@@ -2192,17 +2161,14 @@
{
"options": {
"lm_ntlm_ntlmv2_krb": {
- "color": "semi-dark-green",
"index": 0,
"text": "Enabled"
},
"ntlm_ntlmv2_krb": {
- "color": "semi-dark-green",
"index": 1,
"text": "Enabled"
},
"ntlmv2_krb": {
- "color": "semi-dark-green",
"index": 2,
"text": "Enabled"
}
@@ -2213,9 +2179,8 @@
"options": {
"match": "nan",
"result": {
- "color": "semi-dark-orange",
"index": 3,
- "text": "Disabled"
+ "text": "❌ Disabled"
}
},
"type": "special"
@@ -2446,14 +2411,12 @@
{
"options": {
"false": {
- "color": "semi-dark-green",
"index": 1,
"text": "Disabled"
},
"true": {
- "color": "semi-dark-orange",
"index": 0,
- "text": "Enabled"
+ "text": "❌ Enabled"
}
},
"type": "value"
@@ -2534,9 +2497,8 @@
{
"options": {
"1": {
- "color": "semi-dark-orange",
"index": 1,
- "text": "No"
+ "text": "❌ No"
}
},
"type": "value"
@@ -2545,7 +2507,6 @@
"options": {
"match": "null",
"result": {
- "color": "semi-dark-green",
"index": 0,
"text": "Yes"
}
@@ -2805,7 +2766,7 @@
"refresh": 1,
"regex": "",
"skipUrlSync": false,
- "sort": 0,
+ "sort": 1,
"tagValuesQuery": "",
"tagsQuery": "",
"type": "query",
diff --git a/grafana/dashboards/cmode/harvest_dashboard_security.json b/grafana/dashboards/cmode/harvest_dashboard_security.json
index 300564b69..50f1c918a 100644
--- a/grafana/dashboards/cmode/harvest_dashboard_security.json
+++ b/grafana/dashboards/cmode/harvest_dashboard_security.json
@@ -799,7 +799,7 @@
},
"custom": {
"align": "left",
- "displayMode": "color-background-solid",
+ "displayMode": "auto",
"filterable": false
},
"mappings": [],
@@ -1283,7 +1283,7 @@
},
"custom": {
"align": "left",
- "displayMode": "color-background-solid",
+ "displayMode": "auto",
"filterable": false
},
"mappings": [],
@@ -1876,7 +1876,7 @@
},
"custom": {
"align": "left",
- "displayMode": "color-background-solid",
+ "displayMode": "auto",
"filterable": false
},
"mappings": [],