Skip to content

Commit 76eef34

Browse files
update the variables and remove sph okta values
1 parent 985343b commit 76eef34

File tree

4 files changed

+214
-184
lines changed

4 files changed

+214
-184
lines changed

README.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,15 @@ No modules.
2828

2929
| Name | Description | Type | Default | Required |
3030
|------|-------------|------|---------|:--------:|
31-
| <a name="input_GRAFANA_OAUTH_CLIENT_ID"></a> [GRAFANA\_OAUTH\_CLIENT\_ID](#input\_GRAFANA\_OAUTH\_CLIENT\_ID) | GRAFANA\_OAUTH\_CLIENT\_ID | `string` | `""` | no |
32-
| <a name="input_GRAFANA_OAUTH_CLIENT_SECRET"></a> [GRAFANA\_OAUTH\_CLIENT\_SECRET](#input\_GRAFANA\_OAUTH\_CLIENT\_SECRET) | GRAFANA\_OAUTH\_CLIENT\_SECRET | `string` | `""` | no |
3331
| <a name="input_chart_name"></a> [chart\_name](#input\_chart\_name) | Helm chart name to provision | `string` | `"kube-prometheus-stack"` | no |
3432
| <a name="input_chart_namespace"></a> [chart\_namespace](#input\_chart\_namespace) | Namespace to install the chart into | `string` | `"monitoring"` | no |
3533
| <a name="input_chart_repository"></a> [chart\_repository](#input\_chart\_repository) | Helm repository for the chart | `string` | `"https://prometheus-community.github.io/helm-charts"` | no |
3634
| <a name="input_chart_timeout"></a> [chart\_timeout](#input\_chart\_timeout) | Timeout to wait for the Chart to be deployed. | `number` | `300` | no |
37-
| <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | Version of Chart to install. Set to empty to install the latest version | `string` | `"36.2.1"` | no |
35+
| <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | Version of Chart to install. Set to empty to install the latest version | `string` | `"39.11.0"` | no |
3836
| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Cluster Name where Grafana is deployed | `string` | `""` | no |
3937
| <a name="input_cluster_oidc_issuer_arn"></a> [cluster\_oidc\_issuer\_arn](#input\_cluster\_oidc\_issuer\_arn) | Cluster OIDC URL | `string` | `""` | no |
4038
| <a name="input_cluster_oidc_issuer_url"></a> [cluster\_oidc\_issuer\_url](#input\_cluster\_oidc\_issuer\_url) | Cluster OIDC URL | `string` | `""` | no |
39+
| <a name="input_create_namespace"></a> [create\_namespace](#input\_create\_namespace) | Namespace to install the chart into | `bool` | `false` | no |
4140
| <a name="input_grafana_admin_password_key"></a> [grafana\_admin\_password\_key](#input\_grafana\_admin\_password\_key) | Key in the secret containing the admin password | `string` | `"admin-password"` | no |
4241
| <a name="input_grafana_affinity"></a> [grafana\_affinity](#input\_grafana\_affinity) | Pod affinity | `map(any)` | `{}` | no |
4342
| <a name="input_grafana_annotations"></a> [grafana\_annotations](#input\_grafana\_annotations) | Deployment annotations | `map(any)` | `{}` | no |
@@ -56,10 +55,9 @@ No modules.
5655
| <a name="input_grafana_extra_init_containers"></a> [grafana\_extra\_init\_containers](#input\_grafana\_extra\_init\_containers) | Extra init containers | `list(any)` | `[]` | no |
5756
| <a name="input_grafana_extra_secret_mounts"></a> [grafana\_extra\_secret\_mounts](#input\_grafana\_extra\_secret\_mounts) | Additional grafana server secret mounts | `list(any)` | `[]` | no |
5857
| <a name="input_grafana_extra_volume_mounts"></a> [grafana\_extra\_volume\_mounts](#input\_grafana\_extra\_volume\_mounts) | Additional grafana server volume mounts | `list(any)` | `[]` | no |
59-
| <a name="input_grafana_host_url"></a> [grafana\_host\_url](#input\_grafana\_host\_url) | Grafana Host URL | `string` | `""` | no |
6058
| <a name="input_grafana_image_pull_policy"></a> [grafana\_image\_pull\_policy](#input\_grafana\_image\_pull\_policy) | Image Pull Policy for Grafana | `string` | `"IfNotPresent"` | no |
6159
| <a name="input_grafana_image_repository"></a> [grafana\_image\_repository](#input\_grafana\_image\_repository) | Grafana Image repository on Dockerhub | `string` | `"grafana/grafana"` | no |
62-
| <a name="input_grafana_image_tag"></a> [grafana\_image\_tag](#input\_grafana\_image\_tag) | Grafana Image tag | `string` | `"9.0.2"` | no |
60+
| <a name="input_grafana_image_tag"></a> [grafana\_image\_tag](#input\_grafana\_image\_tag) | Grafana Image tag | `string` | `"9.0.3"` | no |
6361
| <a name="input_grafana_ingress_annotations"></a> [grafana\_ingress\_annotations](#input\_grafana\_ingress\_annotations) | Annotations for ingress | `map(any)` | `{}` | no |
6462
| <a name="input_grafana_ingress_enabled"></a> [grafana\_ingress\_enabled](#input\_grafana\_ingress\_enabled) | Enable Ingress | `bool` | `false` | no |
6563
| <a name="input_grafana_ingress_hosts"></a> [grafana\_ingress\_hosts](#input\_grafana\_ingress\_hosts) | Hosts for ingress | `list(any)` | `[]` | no |
@@ -72,6 +70,8 @@ No modules.
7270
| <a name="input_grafana_main_config"></a> [grafana\_main\_config](#input\_grafana\_main\_config) | Main Config file in YAML | `string` | `"paths:\n data: /var/lib/grafana/data\n logs: /var/log/grafana\n plugins: /var/lib/grafana/plugins\n provisioning: /etc/grafana/provisioning\nanalytics:\n check_for_updates: true\nlog:\n mode: console\ngrafana_net:\n url: https://grafana.netn"` | no |
7371
| <a name="input_grafana_node_selector"></a> [grafana\_node\_selector](#input\_grafana\_node\_selector) | Node selector for Pods | `map(any)` | `{}` | no |
7472
| <a name="input_grafana_notifiers"></a> [grafana\_notifiers](#input\_grafana\_notifiers) | YAML string to configure notifiers http://docs.grafana.org/administration/provisioning/#alert-notification-channels | `string` | `""` | no |
73+
| <a name="input_grafana_oauth_client_id"></a> [grafana\_oauth\_client\_id](#input\_grafana\_oauth\_client\_id) | client\_id of the App | `string` | `""` | no |
74+
| <a name="input_grafana_oauth_client_secret"></a> [grafana\_oauth\_client\_secret](#input\_grafana\_oauth\_client\_secret) | client\_secret between app and authorisation server | `string` | `""` | no |
7575
| <a name="input_grafana_okta_config"></a> [grafana\_okta\_config](#input\_grafana\_okta\_config) | okta config for grafana | `string` | `""` | no |
7676
| <a name="input_grafana_okta_enabled"></a> [grafana\_okta\_enabled](#input\_grafana\_okta\_enabled) | okta config to enable | `bool` | `false` | no |
7777
| <a name="input_grafana_pdb"></a> [grafana\_pdb](#input\_grafana\_pdb) | PodDisruptionBudget for Grafana | `map(any)` | <pre>{<br> "minAvailable": 1<br>}</pre> | no |
@@ -86,45 +86,48 @@ No modules.
8686
| <a name="input_grafana_psp_enable"></a> [grafana\_psp\_enable](#input\_grafana\_psp\_enable) | Enable PSP | `bool` | `true` | no |
8787
| <a name="input_grafana_psp_use_app_armor"></a> [grafana\_psp\_use\_app\_armor](#input\_grafana\_psp\_use\_app\_armor) | Use AppAmor in the PSP | `bool` | `true` | no |
8888
| <a name="input_grafana_resources"></a> [grafana\_resources](#input\_grafana\_resources) | Resources for Grafana container | `map(any)` | `{}` | no |
89-
| <a name="input_grafana_s3_image_bucket"></a> [grafana\_s3\_image\_bucket](#input\_grafana\_s3\_image\_bucket) | Grafana S3 image bucket | `string` | `""` | no |
90-
| <a name="input_grafana_s3_image_bucket_region"></a> [grafana\_s3\_image\_bucket\_region](#input\_grafana\_s3\_image\_bucket\_region) | Region of the Grafana S3 image bucket | `string` | `""` | no |
9189
| <a name="input_grafana_security_context"></a> [grafana\_security\_context](#input\_grafana\_security\_context) | Security context for pods defined as a map which will be serialized to JSON. | `any` | <pre>{<br> "fsGroup": 472,<br> "runAsGroup": 472,<br> "runAsUser": 472<br>}</pre> | no |
92-
| <a name="input_grafana_server_root_url"></a> [grafana\_server\_root\_url](#input\_grafana\_server\_root\_url) | Grafana Server Root URL | `string` | `""` | no |
9390
| <a name="input_grafana_service_account"></a> [grafana\_service\_account](#input\_grafana\_service\_account) | Name of the Service Account for Grafana | `string` | `""` | no |
9491
| <a name="input_grafana_service_account_annotations"></a> [grafana\_service\_account\_annotations](#input\_grafana\_service\_account\_annotations) | Annotations for service account | `map(any)` | `{}` | no |
9592
| <a name="input_grafana_service_annotations"></a> [grafana\_service\_annotations](#input\_grafana\_service\_annotations) | Annotations for the service | `map(any)` | `{}` | no |
9693
| <a name="input_grafana_service_labels"></a> [grafana\_service\_labels](#input\_grafana\_service\_labels) | Labels for the service | `map(any)` | `{}` | no |
97-
| <a name="input_grafana_service_port"></a> [grafana\_service\_port](#input\_grafana\_service\_port) | Port of the service | `string` | `"80"` | no |
98-
| <a name="input_grafana_service_target_port"></a> [grafana\_service\_target\_port](#input\_grafana\_service\_target\_port) | Port in container to expose service | `string` | `"3000"` | no |
94+
| <a name="input_grafana_service_port"></a> [grafana\_service\_port](#input\_grafana\_service\_port) | Port of the service | `number` | `80` | no |
95+
| <a name="input_grafana_service_target_port"></a> [grafana\_service\_target\_port](#input\_grafana\_service\_target\_port) | Port in container to expose service | `number` | `3000` | no |
9996
| <a name="input_grafana_service_type"></a> [grafana\_service\_type](#input\_grafana\_service\_type) | Service type | `string` | `"ClusterIP"` | no |
10097
| <a name="input_grafana_smtp_existing_secret"></a> [grafana\_smtp\_existing\_secret](#input\_grafana\_smtp\_existing\_secret) | Existing secret containing the SMTP credentials | `string` | `""` | no |
10198
| <a name="input_grafana_smtp_password_key"></a> [grafana\_smtp\_password\_key](#input\_grafana\_smtp\_password\_key) | Key in the secret containing the SMTP password | `string` | `"password"` | no |
10299
| <a name="input_grafana_smtp_user_key"></a> [grafana\_smtp\_user\_key](#input\_grafana\_smtp\_user\_key) | Key in the secret containing the SMTP username | `string` | `"user"` | no |
103100
| <a name="input_grafana_tolerations"></a> [grafana\_tolerations](#input\_grafana\_tolerations) | Tolerations for pods | `list(any)` | `[]` | no |
104-
| <a name="input_image"></a> [image](#input\_image) | Docker Image for Grafana | `string` | `"grafana/grafana"` | no |
105101
| <a name="input_image_renderer_annotations"></a> [image\_renderer\_annotations](#input\_image\_renderer\_annotations) | image-renderer deployment annotations | `map(any)` | `{}` | no |
106102
| <a name="input_image_renderer_enabled"></a> [image\_renderer\_enabled](#input\_image\_renderer\_enabled) | Enable the image-renderer deployment and service | `bool` | `true` | no |
107103
| <a name="input_image_renderer_env"></a> [image\_renderer\_env](#input\_image\_renderer\_env) | image-renderer extra environment variables | `map(any)` | <pre>{<br> "HTTP_HOST": "0.0.0.0"<br>}</pre> | no |
108104
| <a name="input_image_renderer_image_repository"></a> [image\_renderer\_image\_repository](#input\_image\_renderer\_image\_repository) | image-renderer Image repository | `string` | `"grafana/grafana-image-renderer"` | no |
109105
| <a name="input_image_renderer_image_tag"></a> [image\_renderer\_image\_tag](#input\_image\_renderer\_image\_tag) | image-renderer Image tag | `string` | `"latest"` | no |
110106
| <a name="input_image_renderer_pod_annotations"></a> [image\_renderer\_pod\_annotations](#input\_image\_renderer\_pod\_annotations) | image-renderer pod annotations | `map(any)` | `{}` | no |
111-
| <a name="input_image_renderer_port"></a> [image\_renderer\_port](#input\_image\_renderer\_port) | image-renderer service port used by both service and deployment | `string` | `"8081"` | no |
107+
| <a name="input_image_renderer_port"></a> [image\_renderer\_port](#input\_image\_renderer\_port) | image-renderer service port used by both service and deployment | `number` | `8081` | no |
112108
| <a name="input_image_renderer_priority_class_name"></a> [image\_renderer\_priority\_class\_name](#input\_image\_renderer\_priority\_class\_name) | image-renderer deployment priority class | `string` | `""` | no |
113109
| <a name="input_image_renderer_replicas"></a> [image\_renderer\_replicas](#input\_image\_renderer\_replicas) | Number of replicas of image-renderer to run | `number` | `1` | no |
114110
| <a name="input_image_renderer_resources"></a> [image\_renderer\_resources](#input\_image\_renderer\_resources) | Resources for image-renderer container | `map(any)` | `{}` | no |
115111
| <a name="input_image_renderer_security_context"></a> [image\_renderer\_security\_context](#input\_image\_renderer\_security\_context) | image-renderer deployment securityContext | `any` | `{}` | no |
116112
| <a name="input_image_renderer_service_account"></a> [image\_renderer\_service\_account](#input\_image\_renderer\_service\_account) | image-renderer deployment serviceAccount | `string` | `""` | no |
117-
| <a name="input_image_renderer_target_port"></a> [image\_renderer\_target\_port](#input\_image\_renderer\_target\_port) | image-renderer service targetPort used by both service and deployment | `string` | `"8081"` | no |
113+
| <a name="input_image_renderer_target_port"></a> [image\_renderer\_target\_port](#input\_image\_renderer\_target\_port) | image-renderer service targetPort used by both service and deployment | `number` | `8081` | no |
118114
| <a name="input_max_history"></a> [max\_history](#input\_max\_history) | Max History for Helm | `number` | `20` | no |
115+
| <a name="input_prometheusSpec_nodeSelector"></a> [prometheusSpec\_nodeSelector](#input\_prometheusSpec\_nodeSelector) | prometheus Spec node selector | `any` | `""` | no |
116+
| <a name="input_prometheus_alertmanagerSpec_nodeSelector"></a> [prometheus\_alertmanagerSpec\_nodeSelector](#input\_prometheus\_alertmanagerSpec\_nodeSelector) | Alertmanager Spec node selector | `any` | `""` | no |
119117
| <a name="input_prometheus_host_url"></a> [prometheus\_host\_url](#input\_prometheus\_host\_url) | Prometheus Host URL | `string` | `""` | no |
120118
| <a name="input_prometheus_image_repository"></a> [prometheus\_image\_repository](#input\_prometheus\_image\_repository) | Prometheus Image repository | `string` | `"quay.io/prometheus/prometheus"` | no |
121119
| <a name="input_prometheus_image_tag"></a> [prometheus\_image\_tag](#input\_prometheus\_image\_tag) | Prometheus Image tag | `string` | `"v2.36.2"` | no |
120+
| <a name="input_prometheus_ingress_annotations"></a> [prometheus\_ingress\_annotations](#input\_prometheus\_ingress\_annotations) | Annotations for ingress | `map(any)` | `{}` | no |
121+
| <a name="input_prometheus_ingress_enabled"></a> [prometheus\_ingress\_enabled](#input\_prometheus\_ingress\_enabled) | Enable Ingress | `bool` | `false` | no |
122+
| <a name="input_prometheus_ingress_hosts"></a> [prometheus\_ingress\_hosts](#input\_prometheus\_ingress\_hosts) | Hosts for ingress | `list(any)` | `[]` | no |
123+
| <a name="input_prometheus_ingress_labels"></a> [prometheus\_ingress\_labels](#input\_prometheus\_ingress\_labels) | Labels for ingress | `map(any)` | `{}` | no |
124+
| <a name="input_prometheus_ingress_tls"></a> [prometheus\_ingress\_tls](#input\_prometheus\_ingress\_tls) | TLS configuration for ingress | `list(any)` | `[]` | no |
122125
| <a name="input_prometheus_operator_image_repository"></a> [prometheus\_operator\_image\_repository](#input\_prometheus\_operator\_image\_repository) | Prometheus Operator Image repository | `string` | `"quay.io/prometheus-operator/prometheus-operator"` | no |
123126
| <a name="input_prometheus_operator_image_tag"></a> [prometheus\_operator\_image\_tag](#input\_prometheus\_operator\_image\_tag) | Prometheus Operator Image Tag | `string` | `"v0.57.0"` | no |
124-
| <a name="input_recreate_pods"></a> [recreate\_pods](#input\_recreate\_pods) | Recreate the pods with every helm update | `bool` | `"false"` | no |
127+
| <a name="input_promethues_operator_nodeSelector"></a> [promethues\_operator\_nodeSelector](#input\_promethues\_operator\_nodeSelector) | Promethues Operator node selector | `any` | `""` | no |
128+
| <a name="input_recreate_pods"></a> [recreate\_pods](#input\_recreate\_pods) | Recreate the pods with every helm update | `bool` | `false` | no |
125129
| <a name="input_release_name"></a> [release\_name](#input\_release\_name) | Helm release name | `string` | `"kube-prometheus-stack"` | no |
126130
| <a name="input_replicas"></a> [replicas](#input\_replicas) | Number of replicas of Grafana to run | `number` | `1` | no |
127-
| <a name="input_tag"></a> [tag](#input\_tag) | Docker Image tag for Grafana | `string` | `"9.0.3"` | no |
128131

129132
## Outputs
130133

main.tf

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,24 @@ locals {
44
prometheus_image_tag = var.prometheus_image_tag
55
prometheus_host_url = var.prometheus_host_url
66

7-
prometheus_operator_image_repository = var.prometheus_operator_image_repository
8-
prometheus_operator_image_tag = var.prometheus_operator_image_tag
7+
prometheus_ingress_enabled = var.prometheus_ingress_enabled
8+
prometheus_ingress_annotations = jsonencode(var.prometheus_ingress_annotations)
9+
prometheus_ingress_labels = jsonencode(var.prometheus_ingress_labels)
10+
prometheus_ingress_hosts = jsonencode(var.prometheus_ingress_hosts)
11+
prometheus_ingress_tls = jsonencode(var.prometheus_ingress_tls)
12+
13+
prometheus_operator_image_repository = var.prometheus_operator_image_repository
14+
prometheus_operator_image_tag = var.prometheus_operator_image_tag
15+
promethues_operator_nodeSelector = var.promethues_operator_nodeSelector
16+
prometheus_alertmanagerSpec_nodeSelector = var.prometheus_alertmanagerSpec_nodeSelector
17+
prometheusSpec_nodeSelector = var.prometheusSpec_nodeSelector
918

1019
################################
1120
######## GRAFANA LOCALS ########
1221
################################
1322
replicas = var.replicas
14-
image = var.image
15-
tag = var.tag
23+
grafana_image_repository = var.grafana_image_repository
24+
grafana_image_tag = var.grafana_image_tag
1625
grafana_image_pull_policy = var.grafana_image_pull_policy
1726

1827
grafana_service_account = var.grafana_service_account
@@ -76,11 +85,11 @@ locals {
7685
grafana_dashboards_config_maps = indent(2, var.grafana_dashboards_config_maps)
7786

7887
grafana_main_config = indent(2, var.grafana_main_config)
79-
grafana_okta_config = indent(2, var.grafana_okta_config)
8088
grafana_db_config = indent(2, var.grafana_db_config)
89+
grafana_okta_config = indent(2, var.grafana_okta_config)
8190
grafana_okta_enabled = var.grafana_okta_enabled
82-
GRAFANA_OAUTH_CLIENT_ID = var.GRAFANA_OAUTH_CLIENT_ID
83-
GRAFANA_OAUTH_CLIENT_SECRET = var.GRAFANA_OAUTH_CLIENT_SECRET
91+
grafana_oauth_client_id = var.grafana_oauth_client_id
92+
grafana_oauth_client_secret = var.grafana_oauth_client_secret
8493

8594
grafana_image_repository = var.grafana_image_repository
8695
grafana_image_tag = var.grafana_image_tag
@@ -115,17 +124,17 @@ locals {
115124
}
116125

117126
resource "helm_release" "kube_prometheus_stack" {
118-
name = var.release_name
119-
chart = var.chart_name
120-
repository = var.chart_repository
121-
version = var.chart_version
122-
namespace = var.chart_namespace
127+
name = var.release_name
128+
chart = var.chart_name
129+
repository = var.chart_repository
130+
version = var.chart_version
131+
namespace = var.chart_namespace
132+
create_namespace = var.create_namespace
123133

124134
max_history = var.max_history
125135
timeout = var.chart_timeout
126136

127137
values = [
128138
templatefile("${path.module}/templates/values.yaml", local.values),
129-
# templatefile("${path.module}/templates/okta_config.yaml", local.values)
130139
]
131140
}

0 commit comments

Comments
 (0)