Merge pull request #34 from lcsvcn/master

fmdlc · Feb 25, 2021 · 5e373b8 · 5e373b8
2 parents 5b4c816 + 6a6e95a
commit 5e373b8
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CHANGELOG
 
-## Octobre 23 2020 - v1.4 (Beta)
+## October 23 2020 - v1.4 (Beta)
 * Improved Kubernetes documentation.
 * Improved main documentation.
 * Updated Grafana deployment to use a `PersistentVolume`.

diff --git a/docker-compose/grafana/network-dashboard.json b/docker-compose/grafana/network-dashboard.json
@@ -210,7 +210,7 @@
         "yaxes": [
           {
             "$$hashKey": "object:401",
-            "format": "Mbits",
+            "format": "MBs",
             "label": null,
             "logBase": 1,
             "max": null,
@@ -249,31 +249,23 @@
                   "value": null
                 },
                 {
-                  "color": "super-light-green",
-                  "value": 0
-                },
-                {
-                  "color": "light-green",
+                  "color": "dark-green",
                   "value": 50
                 },
                 {
                   "color": "semi-dark-green",
                   "value": 100
                 },
                 {
-                  "color": "semi-dark-green",
-                  "value": 150
-                },
-                {
-                  "color": "light-orange",
+                  "color": "#EAB839",
                   "value": 150
                 },
                 {
-                  "color": "super-light-orange",
+                  "color": "semi-dark-orange",
                   "value": 200
                 },
                 {
-                  "color": "semi-dark-orange",
+                  "color": "light-red",
                   "value": 250
                 },
                 {
@@ -389,7 +381,7 @@
                 }
               ]
             },
-            "unit": "Mbits"
+            "unit": "MBs"
           },
           "overrides": []
         },
@@ -647,35 +639,35 @@
                 },
                 {
                   "color": "red",
-                  "value": 0.5
+                  "value": 0.75
                 },
                 {
                   "color": "dark-orange",
-                  "value": 1
+                  "value": 0.875
                 },
                 {
                   "color": "light-yellow",
-                  "value": 2
+                  "value": 1
                 },
                 {
                   "color": "super-light-green",
-                  "value": 3
+                  "value": 1.125
                 },
                 {
                   "color": "light-green",
-                  "value": 4
+                  "value": 1.25
                 },
                 {
                   "color": "semi-dark-green",
-                  "value": 5
+                  "value": 1.375
                 },
                 {
                   "color": "dark-green",
-                  "value": 6
+                  "value": 1.5
                 }
               ]
             },
-            "unit": "Mbits"
+            "unit": "MBs"
           },
           "overrides": []
         },
@@ -905,48 +897,38 @@
             "mappings": [],
             "max": 1000,
             "min": 0,
-            "thresholds": {
-              "mode": "percentage",
-              "steps": [
+            "steps": [
                 {
-                  "color": "super-light-green",
+                  "color": "dark-red",
                   "value": null
                 },
                 {
-                  "color": "light-green",
-                  "value": 10
-                },
-                {
-                  "color": "semi-dark-green",
-                  "value": 20
+                  "color": "light-red",
+                  "value": 9
                 },
                 {
-                  "color": "dark-green",
-                  "value": 30
+                  "color": "dark-orange",
+                  "value": 10
                 },
                 {
                   "color": "super-light-orange",
-                  "value": 40
+                  "value": 11
                 },
                 {
-                  "color": "light-orange",
-                  "value": 50
-                },
-                {
-                  "color": "semi-dark-orange",
-                  "value": 70
+                  "color": "super-light-green",
+                  "value": 12
                 },
                 {
-                  "color": "dark-orange",
-                  "value": 80
+                  "color": "semi-dark-green",
+                  "value": 13
                 },
                 {
-                  "color": "light-red",
-                  "value": 90
+                  "color": "semi-dark-green",
+                  "value": 14
                 },
                 {
-                  "color": "dark-red",
-                  "value": 100
+                  "color": "dark-green",
+                  "value": 15
                 }
               ]
             },
@@ -1801,28 +1783,32 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "super-light-green",
+                  "color": "dark-red",
                   "value": null
                 },
                 {
-                  "color": "semi-dark-green",
-                  "value": 150
+                  "color": "dark-green",
+                  "value": 50
                 },
                 {
-                  "color": "dark-green",
-                  "value": 200
+                  "color": "semi-dark-green",
+                  "value": 100
                 },
                 {
                   "color": "#EAB839",
-                  "value": 250
+                  "value": 150
                 },
                 {
                   "color": "semi-dark-orange",
-                  "value": 300
+                  "value": 200
+                },
+                {
+                  "color": "light-red",
+                  "value": 250
                 },
                 {
                   "color": "dark-red",
-                  "value": 350
+                  "value": 300
                 }
               ]
             },
@@ -1917,28 +1903,32 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "super-light-green",
+                  "color": "dark-red",
                   "value": null
                 },
                 {
-                  "color": "semi-dark-green",
-                  "value": 150
+                  "color": "dark-green",
+                  "value": 50
                 },
                 {
-                  "color": "dark-green",
-                  "value": 200
+                  "color": "semi-dark-green",
+                  "value": 100
                 },
                 {
                   "color": "#EAB839",
-                  "value": 250
+                  "value": 150
                 },
                 {
                   "color": "semi-dark-orange",
-                  "value": 300
+                  "value": 200
+                },
+                {
+                  "color": "light-red",
+                  "value": 250
                 },
                 {
                   "color": "dark-red",
-                  "value": 350
+                  "value": 300
                 }
               ]
             },
@@ -2033,28 +2023,32 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "super-light-green",
+                  "color": "dark-red",
                   "value": null
                 },
                 {
-                  "color": "semi-dark-green",
-                  "value": 150
+                  "color": "dark-green",
+                  "value": 50
                 },
                 {
-                  "color": "dark-green",
-                  "value": 200
+                  "color": "semi-dark-green",
+                  "value": 100
                 },
                 {
                   "color": "#EAB839",
-                  "value": 250
+                  "value": 150
                 },
                 {
                   "color": "semi-dark-orange",
-                  "value": 300
+                  "value": 200
+                },
+                {
+                  "color": "light-red",
+                  "value": 250
                 },
                 {
                   "color": "dark-red",
-                  "value": 350
+                  "value": 300
                 }
               ]
             },

diff --git a/kubernetes/yaml/networkDashboard.yaml b/kubernetes/yaml/networkDashboard.yaml
@@ -220,7 +220,7 @@ data:
           "yaxes": [
             {
               "$$hashKey": "object:401",
-              "format": "Mbits",
+              "format": "MBs",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -399,7 +399,7 @@ data:
                 }
               ]
             },
-          "unit": "Mbits"
+          "unit": "MBs"
           },
         "overrides": []
         },
@@ -685,7 +685,7 @@ data:
                 }
               ]
             },
-          "unit": "Mbits"
+          "unit": "MBs"
           },
         "overrides": []
         },