Added thanos feature for prometheus HA

README.md

@@ -161,6 +161,7 @@ No requirements.
 | <a name="module_loki_scalable_s3_bucket"></a> [loki\_scalable\_s3\_bucket](#module\_loki\_scalable\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | 4.1.2 |
 | <a name="module_s3_bucket_mimir"></a> [s3\_bucket\_mimir](#module\_s3\_bucket\_mimir) | terraform-aws-modules/s3-bucket/aws | 4.1.2 |
 | <a name="module_s3_bucket_temp"></a> [s3\_bucket\_temp](#module\_s3\_bucket\_temp) | terraform-aws-modules/s3-bucket/aws | 4.1.2 |
+| <a name="module_s3_bucket_thanos"></a> [s3\_bucket\_thanos](#module\_s3\_bucket\_thanos) | terraform-aws-modules/s3-bucket/aws | 4.1.2 |
 
 ## Resources
 
@@ -192,6 +193,7 @@ No requirements.
 | [helm_release.stackdriver_exporter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
 | [helm_release.statsd_exporter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
 | [helm_release.tempo](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
+| [helm_release.thanos](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
 | [kubernetes_config_map.argocd_dashboard](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |
 | [kubernetes_config_map.aws_acm](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |
 | [kubernetes_config_map.aws_alb](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |
@@ -236,6 +238,7 @@ No requirements.
 | [kubernetes_config_map.postgres_dashboard](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |
 | [kubernetes_config_map.rabbitmq_dashboard](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |
 | [kubernetes_config_map.redis_dashboard](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |
+| [kubernetes_config_map.thanos-overview_dashboard](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |
 | [kubernetes_namespace.monitoring](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
 | [kubernetes_priority_class.priority_class](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/priority_class) | resource |
 | [null_resource.grafana_homepage](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
@@ -252,8 +255,8 @@ No requirements.
 | <a name="input_blackbox_exporter_version"></a> [blackbox\_exporter\_version](#input\_blackbox\_exporter\_version) | Version of the Blackbox exporter to deploy. | `string` | `"8.17.0"` | no |
 | <a name="input_cloudwatch_enabled"></a> [cloudwatch\_enabled](#input\_cloudwatch\_enabled) | Whether or not to add CloudWatch as datasource and add some default dashboards for AWS in Grafana. | `bool` | `false` | no |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Specifies the name of the EKS cluster. | `string` | n/a | yes |
-| <a name="input_deployment_config"></a> [deployment\_config](#input\_deployment\_config) | Configuration options for the Prometheus, Alertmanager, Loki, and Grafana deployments, including the hostname, storage class name, dashboard refresh interval, and S3 bucket configuration for Mimir. | `any` | <pre>{<br/>  "alb_acm_certificate_arn": "",<br/>  "blackbox_values_yaml": "",<br/>  "dashboard_refresh_interval": "",<br/>  "grafana_enabled": true,<br/>  "grafana_ingress_load_balancer": "nlb",<br/>  "grafana_mimir_values_yaml": "",<br/>  "hostname": "",<br/>  "ingress_class_name": "",<br/>  "loki_hostname": "",<br/>  "loki_internal_ingress_enabled": false,<br/>  "loki_scalable_config": {<br/>    "loki_scalable_values": "",<br/>    "loki_scalable_version": "6.6.5",<br/>    "s3_bucket_name": "",<br/>    "s3_bucket_region": "",<br/>    "versioning_enabled": ""<br/>  },<br/>  "loki_values_yaml": "",<br/>  "mimir_s3_bucket_config": {<br/>    "s3_bucket_name": "",<br/>    "s3_bucket_region": "",<br/>    "s3_object_expiration": "",<br/>    "versioning_enabled": ""<br/>  },<br/>  "otel_config": {<br/>    "otel_collector_enabled": false,<br/>    "otel_operator_enabled": false<br/>  },<br/>  "private_alb_enabled": "",<br/>  "prometheus_hostname": "",<br/>  "prometheus_internal_ingress_enabled": false,<br/>  "prometheus_values_yaml": "",<br/>  "promtail_config": {<br/>    "promtail_values": "",<br/>    "promtail_version": "6.16.3"<br/>  },<br/>  "storage_class_name": "gp2",<br/>  "tempo_config": {<br/>    "s3_bucket_name": "",<br/>    "s3_bucket_region": "",<br/>    "s3_object_expiration": "",<br/>    "versioning_enabled": false<br/>  },<br/>  "tempo_values_yaml": ""<br/>}</pre> | no |
-| <a name="input_exporter_config"></a> [exporter\_config](#input\_exporter\_config) | allows enabling/disabling various exporters for scraping metrics, including Consul, MongoDB, Redis, and StatsD. | `map(any)` | <pre>{<br/>  "argocd": false,<br/>  "blackbox": true,<br/>  "conntrack": false,<br/>  "consul": false,<br/>  "couchdb": false,<br/>  "druid": false,<br/>  "elasticsearch": true,<br/>  "ethtool_exporter": true,<br/>  "istio": false,<br/>  "jenkins": false,<br/>  "json": false,<br/>  "kafka": false,<br/>  "mongodb": true,<br/>  "mysql": true,<br/>  "nats": false,<br/>  "nifi": false,<br/>  "pingdom": false,<br/>  "postgres": false,<br/>  "prometheustosd": false,<br/>  "push_gateway": false,<br/>  "rabbitmq": false,<br/>  "redis": true,<br/>  "snmp": false,<br/>  "stackdriver": false,<br/>  "statsd": true<br/>}</pre> | no |
+| <a name="input_deployment_config"></a> [deployment\_config](#input\_deployment\_config) | Configuration options for the Prometheus, Alertmanager, Loki, and Grafana deployments, including the hostname, storage class name, dashboard refresh interval, and S3 bucket configuration for Mimir. | `any` | <pre>{<br>  "alb_acm_certificate_arn": "",<br>  "blackbox_values_yaml": "",<br>  "dashboard_refresh_interval": "",<br>  "grafana_enabled": true,<br>  "grafana_ingress_load_balancer": "nlb",<br>  "grafana_mimir_values_yaml": "",<br>  "hostname": "",<br>  "ingress_class_name": "",<br>  "loki_hostname": "",<br>  "loki_internal_ingress_enabled": false,<br>  "loki_scalable_config": {<br>    "loki_scalable_values": "",<br>    "loki_scalable_version": "6.6.5",<br>    "s3_bucket_name": "",<br>    "s3_bucket_region": "",<br>    "versioning_enabled": ""<br>  },<br>  "loki_values_yaml": "",<br>  "mimir_s3_bucket_config": {<br>    "s3_bucket_name": "",<br>    "s3_bucket_region": "",<br>    "s3_object_expiration": "",<br>    "versioning_enabled": ""<br>  },<br>  "otel_config": {<br>    "otel_collector_enabled": false,<br>    "otel_operator_enabled": false<br>  },<br>  "private_alb_enabled": "",<br>  "prometheus_hostname": "",<br>  "prometheus_internal_ingress_enabled": false,<br>  "prometheus_replicas": 1,<br>  "prometheus_shards": 1,<br>  "prometheus_values_yaml": "",<br>  "promtail_config": {<br>    "promtail_values": "",<br>    "promtail_version": "6.16.3"<br>  },<br>  "storage_class_name": "gp3",<br>  "tempo_config": {<br>    "s3_bucket_name": "",<br>    "s3_bucket_region": "",<br>    "s3_object_expiration": "",<br>    "versioning_enabled": false<br>  },<br>  "tempo_values_yaml": "",<br>  "thanos_configs": {<br>    "s3_bucket_name": "",<br>    "s3_bucket_region": "",<br>    "s3_object_expiration": "",<br>    "versioning_enabled": ""<br>  },<br>  "thanos_values_yaml": ""<br>}</pre> | no |
+| <a name="input_exporter_config"></a> [exporter\_config](#input\_exporter\_config) | allows enabling/disabling various exporters for scraping metrics, including Consul, MongoDB, Redis, and StatsD. | `map(any)` | <pre>{<br>  "argocd": false,<br>  "blackbox": true,<br>  "conntrack": false,<br>  "consul": false,<br>  "couchdb": false,<br>  "druid": false,<br>  "elasticsearch": true,<br>  "ethtool_exporter": true,<br>  "istio": false,<br>  "jenkins": false,<br>  "json": false,<br>  "kafka": false,<br>  "mongodb": true,<br>  "mysql": true,<br>  "nats": false,<br>  "nifi": false,<br>  "pingdom": false,<br>  "postgres": false,<br>  "prometheustosd": false,<br>  "push_gateway": false,<br>  "rabbitmq": false,<br>  "redis": true,<br>  "snmp": false,<br>  "stackdriver": false,<br>  "statsd": true<br>}</pre> | no |
 | <a name="input_grafana_mimir_enabled"></a> [grafana\_mimir\_enabled](#input\_grafana\_mimir\_enabled) | Specify whether or not to deploy the Grafana Mimir plugin. | `bool` | `false` | no |
 | <a name="input_grafana_mimir_version"></a> [grafana\_mimir\_version](#input\_grafana\_mimir\_version) | Version of the Grafana Mimir plugin to deploy. | `string` | `"5.4.0"` | no |
 | <a name="input_kube_prometheus_stack_enabled"></a> [kube\_prometheus\_stack\_enabled](#input\_kube\_prometheus\_stack\_enabled) | Specify whether or not to deploy Grafana as part of the Prometheus and Alertmanager stack. | `bool` | `false` | no |
@@ -263,6 +266,8 @@ No requirements.
 | <a name="input_pgl_namespace"></a> [pgl\_namespace](#input\_pgl\_namespace) | Name of the Kubernetes namespace where the Grafana deployment will be deployed. | `string` | `"monitoring"` | no |
 | <a name="input_prometheus_chart_version"></a> [prometheus\_chart\_version](#input\_prometheus\_chart\_version) | Version of the Prometheus chart to deploy. | `string` | `"61.1.0"` | no |
 | <a name="input_tempo_enabled"></a> [tempo\_enabled](#input\_tempo\_enabled) | Enable Grafana Tempo | `bool` | `false` | no |
+| <a name="input_thanos_chart_version"></a> [thanos\_chart\_version](#input\_thanos\_chart\_version) | helm chart version for thanos | `string` | `"15.10.2"` | no |
+| <a name="input_thanos_enabled"></a> [thanos\_enabled](#input\_thanos\_enabled) | Choose whether to enable Thanos HA setup for kube-prometheus stack | `bool` | `false` | no |
 
 ## Outputs
 

examples/complete/README.md

@@ -21,7 +21,7 @@ No requirements.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_pgl"></a> [pgl](#module\_pgl) | squareops/grafana-stack/kubernetes | 3.0.3 |
+| <a name="module_pgl"></a> [pgl](#module\_pgl) | squareops/grafana-stack/kubernetes | 4.0.0 |
 
 ## Resources
 

examples/complete/helm/prometheus.yaml

@@ -198,7 +198,7 @@ prometheus:
           resources:
             requests:
               storage: 50Gi
-    retention: 30d
+    retention: 2d
     walCompression: true
     ## If true, the Operator won't process any Prometheus configuration changes
     ##
@@ -226,3 +226,22 @@ prometheus:
 # prometheus-node-exporter:
 #   rbac:
 #     pspEnabled: true
+thanosRuler:
+  thanosRulerSpec:
+    retention: 24h
+    resources:
+      requests:
+        memory: 200Mi
+        cpu: 100m
+      limits:
+        memory: 400Mi
+        cpu: 200m
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: "Addons-Services"
+              operator: In
+              values:
+              - "true"

examples/complete/helm/thanos.yaml

@@ -0,0 +1,93 @@
+query:
+  containerPorts:
+    http: 10902
+    grpc: 10901
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      cpu: 100m
+      memory: 200Mi
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: "Addons-Services"
+            operator: In
+            values:
+            - "true"
+queryFrontend:
+  enabled: true
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      cpu: 100m
+      memory: 200Mi
+
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: "Addons-Services"
+            operator: In
+            values:
+            - "true"
+bucketweb:
+  refresh: 30m
+  timeout: 5m
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      cpu: 100m
+      memory: 200Mi
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: "Addons-Services"
+            operator: In
+            values:
+            - "true"
+compactor:
+  retentionResolutionRaw: 30d
+  retentionResolution5m: 90d
+  retentionResolution1h: 1y
+  consistencyDelay: 5m
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: "Addons-Services"
+            operator: In
+            values:
+            - "true"
+  persistence:
+    size: 8Gi
+storegateway:
+  resources:
+    requests:
+      cpu: 50m
+      memory: 100Mi
+    limits:
+      cpu: 100m
+      memory: 200Mi
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: "Addons-Services"
+            operator: In
+            values:
+            - "true"
+  persistence:
+    size: 8Gi

examples/complete/main.tf

@@ -13,13 +13,14 @@ locals {
 
 module "pgl" {
   source                        = "squareops/grafana-stack/kubernetes"
-  version                       = "3.0.3"
+  version                       = "4.0.0"
   cluster_name                  = ""
   kube_prometheus_stack_enabled = true
-  loki_enabled                  = false
-  loki_scalable_enabled         = true
-  grafana_mimir_enabled         = true
+  loki_enabled                  = true
+  loki_scalable_enabled         = false
+  grafana_mimir_enabled         = false
   cloudwatch_enabled            = true
+  thanos_enabled                = false
   tempo_enabled                 = false
   deployment_config = {
     hostname                            = "grafana.squareops.com"
@@ -28,9 +29,13 @@ module "pgl" {
     loki_values_yaml                    = file("./helm/loki.yaml")
     blackbox_values_yaml                = file("./helm/blackbox.yaml")
     grafana_mimir_values_yaml           = file("./helm/mimir.yaml")
+    thanos_values_yaml                  = file("./helm/thanos.yaml")
     tempo_values_yaml                   = file("./helm/tempo.yaml")
+    prometheus_replicas                 = 1
+    prometheus_shards                   = 1
     dashboard_refresh_interval          = ""
     grafana_enabled                     = true
+    grafana_ha_enabled                  = true
     prometheus_hostname                 = "prometheus.com"
     prometheus_internal_ingress_enabled = false
     grafana_ingress_load_balancer       = "nlb"   ##Choose your load balancer type (e.g., NLB or ALB). If using ALB, ensure you provide the ACM certificate ARN for SSL.
@@ -39,6 +44,12 @@ module "pgl" {
     private_alb_enabled                 = false   # Set to true, when wanted to deploy PGL on ALB internal
     loki_internal_ingress_enabled       = false
     loki_hostname                       = "loki.com"
+    thanos_configs = {
+      s3_bucket_name       = "${local.environment}-${local.name}-thanos-bucket"
+      versioning_enabled   = "false"
+      s3_bucket_region     = "${local.region}"
+      s3_object_expiration = 90
+    }
     mimir_s3_bucket_config = {
       s3_bucket_name       = "${local.environment}-${local.name}-mimir-bucket"
       versioning_enabled   = "false"

grafana/dashboards/analytics_nginx_logs.json

@@ -2019,4 +2019,4 @@
     "uid": "fgc-nginx-web-analytics",
     "version": 3,
     "weekStart": ""
-  }
+  }

grafana/dashboards/ingress_nginx.json

@@ -44,7 +44,7 @@
   "fiscalYearStartMonth": 0,
   "gnetId": 14314,
   "graphTooltip": 0,
-  "id": 4246,
+  "id": 27,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -139,7 +139,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -222,7 +222,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -305,7 +305,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -388,7 +388,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -474,7 +474,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -557,7 +557,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -641,7 +641,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -725,7 +725,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -809,7 +809,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "targets": [
         {
           "datasource": {
@@ -905,6 +905,7 @@
           "showLegend": false
         },
         "tooltip": {
+          "maxHeight": 600,
           "mode": "multi",
           "sort": "none"
         }
@@ -1095,6 +1096,7 @@
           "showLegend": true
         },
         "tooltip": {
+          "maxHeight": 600,
           "mode": "multi",
           "sort": "none"
         }
@@ -1207,6 +1209,7 @@
           "showLegend": false
         },
         "tooltip": {
+          "maxHeight": 600,
           "mode": "multi",
           "sort": "none"
         }
@@ -1487,6 +1490,7 @@
           "showLegend": true
         },
         "tooltip": {
+          "maxHeight": 600,
           "mode": "multi",
           "sort": "desc"
         }
@@ -1645,6 +1649,7 @@
         },
         "showValue": "never",
         "tooltip": {
+          "maxHeight": 600,
           "mode": "single",
           "showColorScale": false,
           "yHistogram": false
@@ -1656,7 +1661,7 @@
           "unit": "s"
         }
       },
-      "pluginVersion": "11.1.0",
+      "pluginVersion": "11.0.0",
       "reverseYBuckets": false,
       "targets": [
         {
@@ -2316,8 +2321,8 @@
       {
         "current": {
           "selected": true,
-          "text": "Prometheus",
-          "value": "prometheus"
+          "text": "default",
+          "value": "default"
         },
         "hide": 0,
         "includeAll": false,
@@ -2337,6 +2342,7 @@
     "from": "now-3h",
     "to": "now"
   },
+  "timeRangeUpdatedDuringEditOrView": false,
   "timepicker": {
     "refresh_intervals": [
       "10s",
@@ -2364,6 +2370,6 @@
   "timezone": "browser",
   "title": "Kubernetes Nginx Ingress Prometheus NextGen",
   "uid": "k8s-nginx-ingress-prometheus-ng",
-  "version": 5,
+  "version": 1,
   "weekStart": ""
-}
+}