Updated Grafana Chart Values

Author: franklinpashok

README.md

@@ -80,7 +80,7 @@ No modules.
 | <a name="input_grafana_persistence_existing_claim"></a> [grafana\_persistence\_existing\_claim](#input\_grafana\_persistence\_existing\_claim) | Use an existing PVC | `string` | `""` | no |
 | <a name="input_grafana_persistence_size"></a> [grafana\_persistence\_size](#input\_grafana\_persistence\_size) | Size of the PV | `string` | `"10Gi"` | no |
 | <a name="input_grafana_persistence_storage_class_name"></a> [grafana\_persistence\_storage\_class\_name](#input\_grafana\_persistence\_storage\_class\_name) | Storage Class name for the PV | `string` | `"default"` | no |
-| <a name="input_grafana_plugins"></a> [grafana\_plugins](#input\_grafana\_plugins) | List of plugins to install | `list` | `[]` | no |
+| <a name="input_grafana_plugins"></a> [grafana\_plugins](#input\_grafana\_plugins) | List of plugins to install | `list(any)` | `[]` | no |
 | <a name="input_grafana_pod_annotations"></a> [grafana\_pod\_annotations](#input\_grafana\_pod\_annotations) | Pod annotations | `map(any)` | `{}` | no |
 | <a name="input_grafana_priority_class_name"></a> [grafana\_priority\_class\_name](#input\_grafana\_priority\_class\_name) | Priority Class name for Grafana | `string` | `""` | no |
 | <a name="input_grafana_psp_enable"></a> [grafana\_psp\_enable](#input\_grafana\_psp\_enable) | Enable PSP | `bool` | `true` | no |

templates/values.yaml

@@ -1319,84 +1319,84 @@ grafana:
   #     cpu: 50m
   #     memory: 50Mi
 
-  ## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled
-  ##
-  forceDeployDatasources: false
-
-  ## ForceDeployDashboard Create dashboard configmap even if grafana deployment has been disabled
-  ##
-  forceDeployDashboards: false
-
-  ## Deploy default dashboards
-  ##
-  defaultDashboardsEnabled: true
-
-  ## Timezone for the default dashboards
-  ## Other options are: browser or a specific timezone, i.e. Europe/Luxembourg
-  ##
-  defaultDashboardsTimezone: utc
-
-  sidecar:
-    dashboards:
-      enabled: true
-      label: grafana_dashboard
-      labelValue: "1"
-      folder: /var/lib/grafana/dashboards
-
-      ## Annotations for Grafana dashboard configmaps
-      ##
-      annotations: {}
-      multicluster:
-        global:
-          enabled: false
-        etcd:
-          enabled: false
-      provider:
-        allowUiUpdates: false
-    datasources:
-      enabled: true
-      defaultDatasourceEnabled: true
-
-      uid: prometheus
-
-      ## URL of prometheus datasource
-      ##
-      # url: http://prometheus-stack-prometheus:9090/
-
-      # If not defined, will use prometheus.prometheusSpec.scrapeInterval or its default
-      # defaultDatasourceScrapeInterval: 15s
-
-      ## Annotations for Grafana datasource configmaps
-      ##
-      annotations: {}
-
-      ## Create datasource for each Pod of Prometheus StatefulSet;
-      ## this uses headless service `prometheus-operated` which is
-      ## created by Prometheus Operator
-      ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/0fee93e12dc7c2ea1218f19ae25ec6b893460590/pkg/prometheus/statefulset.go#L255-L286
-      createPrometheusReplicasDatasources: false
-      label: grafana_datasource
-      labelValue: "1"
-
-  deleteDatasources: []
-  # - name: example-datasource
-  #   orgId: 1
-
-  ## Configure additional grafana datasources (passed through tpl)
-  ## ref: http://docs.grafana.org/administration/provisioning/#datasources
-  additionalDataSources: []
-  # - name: prometheus-sample
-  #   access: proxy
-  #   basicAuth: true
-  #   basicAuthPassword: pass
-  #   basicAuthUser: daco
-  #   editable: false
-  #   jsonData:
-  #       tlsSkipVerify: true
-  #   orgId: 1
-  #   type: prometheus
-  #   url: https://{{ printf "%s-prometheus.svc" .Release.Name }}:9090
-  #   version: 1
+  # ## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled
+  # ##
+  # forceDeployDatasources: false
+
+  # ## ForceDeployDashboard Create dashboard configmap even if grafana deployment has been disabled
+  # ##
+  # forceDeployDashboards: false
+
+  # ## Deploy default dashboards
+  # ##
+  # defaultDashboardsEnabled: true
+
+  # ## Timezone for the default dashboards
+  # ## Other options are: browser or a specific timezone, i.e. Europe/Luxembourg
+  # ##
+  # defaultDashboardsTimezone: utc
+
+  # sidecar:
+  #   dashboards:
+  #     enabled: true
+  #     label: grafana_dashboard
+  #     labelValue: "1"
+  #     folder: /var/lib/grafana/dashboards
+
+  #     ## Annotations for Grafana dashboard configmaps
+  #     ##
+  #     annotations: {}
+  #     multicluster:
+  #       global:
+  #         enabled: false
+  #       etcd:
+  #         enabled: false
+  #     provider:
+  #       allowUiUpdates: false
+  #   datasources:
+  #     enabled: true
+  #     defaultDatasourceEnabled: true
+
+  #     uid: prometheus
+
+  #     ## URL of prometheus datasource
+  #     ##
+  #     # url: http://prometheus-stack-prometheus:9090/
+
+  #     # If not defined, will use prometheus.prometheusSpec.scrapeInterval or its default
+  #     # defaultDatasourceScrapeInterval: 15s
+
+  #     ## Annotations for Grafana datasource configmaps
+  #     ##
+  #     annotations: {}
+
+  #     ## Create datasource for each Pod of Prometheus StatefulSet;
+  #     ## this uses headless service `prometheus-operated` which is
+  #     ## created by Prometheus Operator
+  #     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/0fee93e12dc7c2ea1218f19ae25ec6b893460590/pkg/prometheus/statefulset.go#L255-L286
+  #     createPrometheusReplicasDatasources: false
+  #     label: grafana_datasource
+  #     labelValue: "1"
+
+  # deleteDatasources: []
+  # # - name: example-datasource
+  # #   orgId: 1
+
+  # ## Configure additional grafana datasources (passed through tpl)
+  # ## ref: http://docs.grafana.org/administration/provisioning/#datasources
+  # additionalDataSources: []
+  # # - name: prometheus-sample
+  # #   access: proxy
+  # #   basicAuth: true
+  # #   basicAuthPassword: pass
+  # #   basicAuthUser: daco
+  # #   editable: false
+  # #   jsonData:
+  # #       tlsSkipVerify: true
+  # #   orgId: 1
+  # #   type: prometheus
+  # #   url: https://{{ printf "%s-prometheus.svc" .Release.Name }}:9090
+  # #   version: 1
 
 ##############################################
 ############# GRAFANA CONFIG #################

variables.tf

@@ -380,6 +380,7 @@ variable "grafana_command" {
 
 variable "grafana_plugins" {
   description = "List of plugins to install"
+  type        = list(any)
   default     = []
 }