fix(prometheus): correct prometheus GUI mistakes

charts/dependency/mariadb/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "10.6.5"
 dependencies:
 - name: common
   repository: https://truecharts.org
-  version: 8.9.0
+  version: 8.9.1
 deprecated: false
 description: Fast, reliable, scalable, and easy to use open-source relational database system.
 home: https://github.com/truecharts/apps/tree/master/stable/mariadb
@@ -24,7 +24,7 @@ sources:
   - https://github.com/prometheus/mysqld_exporter
   - https://mariadb.org
 type: application
-version: 1.0.8
+version: 1.0.9
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/memcached/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "1.6.12"
 dependencies:
 - name: common
   repository: https://truecharts.org
-  version: 8.9.0
+  version: 8.9.1
 deprecated: false
 description: Memcached is a memory-backed database caching solution
 home: https://github.com/truecharts/apps/tree/master/stable/memcached
@@ -22,7 +22,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-memcached
   - http://memcached.org/
 type: application
-version: 1.0.9
+version: 1.0.10
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/postgresql/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "14.1.0"
 dependencies:
 - name: common
   repository: https://truecharts.org
-  version: 8.9.0
+  version: 8.9.1
 deprecated: false
 description: PostgresSQL
 home: https://github.com/truecharts/apps/tree/master/stable/postgres
@@ -22,7 +22,7 @@ name: postgresql
 sources:
 - https://www.postgresql.org/
 type: application
-version: 6.0.6
+version: 6.0.7
 annotations:
   truecharts.org/catagories: |
     - database

charts/dependency/redis/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "6.2.6"
 dependencies:
 - name: common
   repository: https://truecharts.org
-  version: 8.9.0
+  version: 8.9.1
 deprecated: false
 description: Open source, advanced key-value store.
 home: https://github.com/truecharts/apps/tree/master/stable/redis
@@ -22,7 +22,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-redis
   - http://redis.io/
 type: application
-version: 1.0.10
+version: 1.0.11
 annotations:
   truecharts.org/catagories: |
     - database

charts/incubator/prometheus/Chart.yaml

@@ -20,7 +20,7 @@ sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 0.0.3
+version: 0.0.4
 annotations:
   truecharts.org/catagories: |
     - metrics

charts/incubator/prometheus/questions.yaml

@@ -24,20 +24,7 @@ questions:
             type: boolean
             default: true
 
-  - variable: serviceexpert
+
-    group: "Networking and Services"
-    label: "Show Expert Config"
-    schema:
-      type: boolean
-      default: false
-      show_subquestions_if: true
-      subquestions:
-        - variable: hostNetwork
-          group: "Networking and Services"
-          label: "Host-Networking (Complicated)"
-          schema:
-            type: boolean
-            default: false
   - variable: service
     group: "Networking and Services"
     label: "Configure Service(s)"
@@ -56,6 +43,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10086
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -95,16 +89,10 @@ questions:
                                   schema:
                                     type: int
                                     default: 9090
-                          - variable: port
+
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 10086
-                              required: true
         - variable: promop
           label: "Operator Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          description: "The Primary service on which the healthcheck runs"
           schema:
             type: dict
             attrs:
@@ -114,6 +102,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10089
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -153,15 +148,9 @@ questions:
                                   schema:
                                     type: int
                                     default: 8080
-                          - variable: port
+
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 10089
-                              required: true
         - variable: alertmanager
-          label: "Main Service"
+          label: "alertmanager Service"
           description: "alertmanager service "
           schema:
             type: dict
@@ -172,6 +161,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10087
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -211,13 +207,21 @@ questions:
                                   schema:
                                     type: int
                                     default: 9093
-                          - variable: port
+
-                            label: "Port"
+  - variable: serviceexpert
-                            description: "This port exposes the container port on the service"
+    group: "Networking and Services"
+    label: "Show Expert Config"
     schema:
-                              type: int
+      type: boolean
-                              default: 10087
+      default: false
-                              required: true
+      show_subquestions_if: true
+      subquestions:
+        - variable: hostNetwork
+          group: "Networking and Services"
+          label: "Host-Networking (Complicated)"
+          schema:
+            type: boolean
+            default: false
 # Include{serviceExpert}
 
 # Include{serviceList}