From f3394fe096dd6b5a11906b3585340b86098fa51e Mon Sep 17 00:00:00 2001
From: Marius Ensrud <marius.ensrud@buypass.no>
Date: Thu, 8 Oct 2020 15:28:13 +0200
Subject: [PATCH] update questions

---
 charts/prometheus/v6.3.0/questions.yml | 131 ++++++-------------------
 1 file changed, 28 insertions(+), 103 deletions(-)

diff --git a/charts/prometheus/v6.3.0/questions.yml b/charts/prometheus/v6.3.0/questions.yml
index 505ea4f..24c6244 100644
--- a/charts/prometheus/v6.3.0/questions.yml
+++ b/charts/prometheus/v6.3.0/questions.yml
@@ -81,26 +81,26 @@ questions:
     description: "Kube-state-metrics image tag"
     type: string
     label: KubeStateMetrics Image Tag
-  - variable: grafana.image.repository
-    default: "grafana/grafana"
-    description: "Grafana image name"
-    type: string
-    label: Grafana Image Name
-  - variable: grafana.image.tag
-    default: "5.3.1"
-    description: "Grafana image tag"
-    type: string
-    label: Grafana Image Tag
-  - variable: grafana.grafanaWatcher.image.repository
-    default: "quay.io/coreos/grafana-watcher"
-    description: "Grafana Watcher image name"
-    type: string
-    label: Grafana Watcher Image Name
-  - variable: grafana.grafanaWatcher.image.tag
-    default: "v0.0.8"
-    description: "Grafana Watcher image tag"
-    type: string
-    label: Grafana Watcher Image Tag
+#  - variable: grafana.image.repository
+#    default: "grafana/grafana"
+#    description: "Grafana image name"
+#    type: string
+#    label: Grafana Image Name
+#  - variable: grafana.image.tag
+#    default: "5.3.1"
+#    description: "Grafana image tag"
+#    type: string
+#    label: Grafana Image Tag
+#  - variable: grafana.grafanaWatcher.image.repository
+#    default: "quay.io/coreos/grafana-watcher"
+#    description: "Grafana Watcher image name"
+#    type: string
+#    label: Grafana Watcher Image Name
+#  - variable: grafana.grafanaWatcher.image.tag
+#    default: "v0.0.8"
+#    description: "Grafana Watcher image tag"
+#    type: string
+#    label: Grafana Watcher Image Tag
 # server configurations
 - variable: server.ingress.enabled
   default: true
@@ -158,88 +158,6 @@ questions:
     description: "Prometheus data persistent volume storageClass, if not set use default StorageClass"
     type: storageclass
     label: Prometheus Persistent Volume StorageClass
-# grafana configurations
-- variable: grafana.enabled
-  default: true
-  description: "Create Grafana Dashboard"
-  type: boolean
-  group: "Grafana Settings"
-  label: Enable Grafana Dashboard
-  show_subquestion_if: "true"
-  subquestions:
-  - variable: grafana.adminUser
-    default: "admin"
-    description: "Grafana admin username"
-    type: string
-    group: "Grafana Settings"
-    label: Grafana Admin Username
-    required: true
-  - variable: grafana.adminPassword
-    default: ""
-    description: "Grafana admin password"
-    type: password
-    group: "Grafana Settings"
-    label: Grafana Admin Password
-- variable: grafana.ingress.enabled
-  default: "true"
-  description: "Expose grafana using Layer 7 Load Balancer - ingress"
-  type: boolean
-  group: "Grafana Settings"
-  label: Expose Grafana using Layer 7 Load Balancer
-  show_if: "grafana.enabled=true"
-  required: true
-  show_subquestion_if: true
-  subquestions:
-  - variable: grafana.ingress.hosts[0]
-    default: "xip.io"
-    description: "Hostname to your grafana installation"
-    type: hostname
-    required: true
-    label: Hostname
-    show_if: "grafana.enabled=true"
-- variable: grafana.service.type
-  default: "NodePort"
-  description: "Grafana service type"
-  type: enum
-  group: "Grafana Settings"
-  show_if: "grafana.enabled=true"
-  options:
-    - "ClusterIP"
-    - "NodePort"
-  required: true
-  label: Grafana Service Type
-  show_if: "grafana.enabled=true&&grafana.ingress.enabled=false"
-  show_subquestion_if: "NodePort"
-  subquestions:
-  - variable: grafana.service.nodePort
-    default: ""
-    description: "NodePort http port(to set explicitly, choose port between 30000-32767)"
-    type: int
-    min: 30000
-    max: 32767
-    label: Grafana NodePort Number
-    show_if: "grafana.enabled=true&&grafana.ingress.enabled=false"
-- variable: grafana.persistence.enabled
-  default: "false"
-  description: "Enable persistent volume for Grafana"
-  type: boolean
-  required: true
-  label: Grafana Persistent Volume Enabled
-  show_if: "grafana.enabled=true"
-  show_subquestion_if: true
-  group: "Grafana Settings"
-  subquestions:
-  - variable: grafana.persistence.size
-    default: "8Gi"
-    description: "Grafana Persistent Volume Size"
-    type: string
-    label: Grafana Volume Size
-    required: true
-  - variable: grafana.persistence.storageClass
-    default: ""
-    description: "If undefined or set to null, using the default storageClass. Defaults to null."
-    type: storageclass
-    label: Storage Class for Grafana
 # alertmanager configurations
 - variable: alertmanager.enabled
   default: "true"
@@ -248,6 +166,13 @@ questions:
   group: "Alertmanager"
   label: Enable Alertmanager
   show_subquestion_if: true
+- variable: alertmanager.service.hostPort
+  default: "9100"
+  description: "Alertmanager Service hostPort"
+  type: string
+  group: "Alertmanager"
+  label: Alertmanager Service hostPort
+  show_if: "alertmanager.enabled=true"
 - variable: alertmanager.ingress.enabled
   default: "false"
   description: "Expose alertmanager using Layer 7 Load Balancer - ingress"
@@ -266,7 +191,7 @@ questions:
     label: Hostname
     show_if: "alertmanager.enabled=true"
 - variable: alertmanager.service.type
-  default: "NodePort"
+  default: "ClusterIP"
   description: "Alertmanager service type"
   type: enum
   show_if: "alertmanager.ingress.enabled=false&&alertmanager.enabled=true"