Merge pull request #253 from awslabs/fix-amp

fix: Added a fix for Grafana to use sigv4 authentication
awslabs · Jul 17, 2023 · e771f22 · e771f22
2 parents c54b857 + 9121043
commit e771f22
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/analytics/terraform/emr-eks-karpenter/addons.tf b/analytics/terraform/emr-eks-karpenter/addons.tf
@@ -185,6 +185,7 @@ module "kubernetes_data_addons" {
   #---------------------------------------------------------------
   # Kubecost Add-on
   #---------------------------------------------------------------
+  # Note: Kubecost add-on depdends on Kube Prometheus Stack add-on for storing the metrics
   enable_kubecost = var.enable_kubecost
   kubecost_helm_config = {
     values              = [templatefile("${path.module}/helm-values/kubecost-values.yaml", {})]

diff --git a/analytics/terraform/emr-eks-karpenter/helm-values/kube-prometheus-amp-enable.yaml b/analytics/terraform/emr-eks-karpenter/helm-values/kube-prometheus-amp-enable.yaml
@@ -18,13 +18,13 @@ prometheus:
     scrapeInterval: 30s
     evaluationInterval: 30s
     scrapeTimeout: 10s
-    storageSpec: 
+    storageSpec:
       volumeClaimTemplate:
         metadata:
           name: data
         spec:
           storageClassName: gp2
-          accessModes: 
+          accessModes:
             - ReadWriteOnce
           resources:
             requests:
@@ -51,12 +51,15 @@ grafana:
 # Adding AMP datasource to Grafana config
   serviceAccount:
     name: ${amp_sa}
+  grafana.ini:
+    auth:
+      sigv4_auth_enabled: true
   additionalDataSources:
     - name: AMP
       editable: true
       jsonData:
         sigV4Auth: true
         sigV4Region: ${region}
       type: prometheus
-      isDefault: true
+      isDefault: false
       url: ${amp_remotewrite_url}
diff --git a/analytics/terraform/emr-eks-karpenter/helm-values/kube-prometheus.yaml b/analytics/terraform/emr-eks-karpenter/helm-values/kube-prometheus.yaml
@@ -4,13 +4,13 @@ prometheus:
     scrapeInterval: 30s
     evaluationInterval: 30s
     scrapeTimeout: 10s
-    storageSpec: 
+    storageSpec:
       volumeClaimTemplate:
         metadata:
           name: data
         spec:
           storageClassName: gp2
-          accessModes: 
+          accessModes:
             - ReadWriteOnce
           resources:
             requests:
@@ -34,4 +34,3 @@ alertmanager:
 grafana:
   enabled: true
   defaultDashboardsEnabled: true
-