Fixes requested for pull request

- Grafana was automatically adding the current values of variables in
the JSON code the way we were exporting it. Removed the values from
alldashboard
- Ensured all Inspector with hidden variable would always have a default
values not generating Grafana missing variable error : could have been
confusing for the user
- Reset the default port of the server to 8080. However the new bridge
server still have 8043 as default port

Author: sap-coutantm

deploy/infrabox/grafana/dashboards/build_inspector.json

@@ -190,40 +190,23 @@
   "templating": {
     "list": [
       {
-        "allValue": null,
-        "current": {
-          "text": "0006fa7e-b193-4dd2-a746-6c6be16f7d8c",
-          "value": "0006fa7e-b193-4dd2-a746-6c6be16f7d8c"
-        },
+	"allValue": null,
+        "datasource": "infrabox",
         "hide": 2,
         "includeAll": false,
         "label": "",
         "multi": false,
         "name": "bid",
-        "options": [
-          {
-            "selected": true,
-            "text": "0006fa7e-b193-4dd2-a746-6c6be16f7d8c",
-            "value": "0006fa7e-b193-4dd2-a746-6c6be16f7d8c"
-          },
-          {
-            "selected": false,
-            "text": "0009ad79-6814-44c4-b33b-66326af7e849",
-            "value": "0009ad79-6814-44c4-b33b-66326af7e849"
-          },
-          {
-            "selected": false,
-            "text": "00225b05-6417-49d6-846a-6aab6a105695",
-            "value": "00225b05-6417-49d6-846a-6aab6a105695"
-          },
-          {
-            "selected": false,
-            "text": "005d6f95-68d7-41d3-88a9-8c323eb66f4f",
-            "value": "005d6f95-68d7-41d3-88a9-8c323eb66f4f"
-          }
-        ],
-        "query": "0006fa7e-b193-4dd2-a746-6c6be16f7d8c,0009ad79-6814-44c4-b33b-66326af7e849,00225b05-6417-49d6-846a-6aab6a105695,005d6f95-68d7-41d3-88a9-8c323eb66f4f",
-        "type": "custom"
+        "options": [],
+        "query": "SELECT id FROM build LIMIT 1",
+        "refresh": 1,
+        "regex": "",
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
       }
     ]
   },

deploy/infrabox/grafana/dashboards/cluster_inspector.json

@@ -753,11 +753,6 @@
     "list": [
       {
         "allValue": null,
-        "current": {
-          "tags": [],
-          "text": "eu-de-2",
-          "value": "eu-de-2"
-        },
         "datasource": "infrabox",
         "hide": 0,
         "includeAll": false,

deploy/infrabox/grafana/dashboards/job_inspector.json

@@ -480,24 +480,22 @@
     "list": [
       {
         "allValue": null,
-        "current": {
-          "text": "7ee5fa36-deca-4e32-9cb8-a8ee64ca92db",
-          "value": "7ee5fa36-deca-4e32-9cb8-a8ee64ca92db"
-        },
+        "datasource": "infrabox",
         "hide": 2,
         "includeAll": false,
         "label": "",
         "multi": false,
         "name": "id",
-        "options": [
-          {
-            "selected": true,
-            "text": "7ee5fa36-deca-4e32-9cb8-a8ee64ca92db",
-            "value": "7ee5fa36-deca-4e32-9cb8-a8ee64ca92db"
-          }
-        ],
-        "query": "7ee5fa36-deca-4e32-9cb8-a8ee64ca92db",
-        "type": "custom"
+        "options": [],
+        "query": "SELECT id FROM job LIMIT 1",
+        "refresh": 1,
+        "regex": "",
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
       }
     ]
   },

deploy/infrabox/grafana/dashboards/node_inspector.json

@@ -849,10 +849,6 @@
     "list": [
       {
         "allValue": null,
-        "current": {
-          "text": "k8s-ib-ha-worker-002",
-          "value": "k8s-ib-ha-worker-002"
-        },
         "datasource": "infrabox",
         "hide": 0,
         "includeAll": false,

deploy/infrabox/grafana/dashboards/project_inspector.json

@@ -1024,10 +1024,6 @@
     "list": [
       {
         "allValue": null,
-        "current": {
-          "text": "hanalite-releasepack",
-          "value": "hanalite-releasepack"
-        },
         "datasource": "infrabox",
         "hide": 0,
         "includeAll": false,
@@ -1047,11 +1043,6 @@
       },
       {
         "allValue": "'%'",
-        "current": {
-          "tags": [],
-          "text": "calico",
-          "value": "calico"
-        },
         "datasource": "infrabox",
         "hide": 0,
         "includeAll": true,

src/metrics/collector_server/server.py

@@ -165,7 +165,7 @@ def main():
     get_env('INFRABOX_DATABASE_PASSWORD')
     get_env('INFRABOX_DATABASE_HOST')
     get_env('INFRABOX_DATABASE_PORT')
-    server_port = os.environ.get('INFRABOX_PORT', 8043)
+    server_port = os.environ.get('INFRABOX_PORT', 8080)
 
     # Copied from review.py, could be changed over time
     conn = connect_db()