diff --git a/monitoring/grafana-aether/Chart.yaml b/monitoring/grafana-aether/Chart.yaml
index 0645104..e95faa5 100644
--- a/monitoring/grafana-aether/Chart.yaml
+++ b/monitoring/grafana-aether/Chart.yaml
@@ -5,6 +5,6 @@
 name: grafana-aether
 description: A Helm chart for deploying Grafana with Aether dashboards
 
-version: 0.5.5
+version: 0.5.6
 
 appVersion: 0.1.0
diff --git a/monitoring/grafana-aether/templates/datasource-configmap.yaml b/monitoring/grafana-aether/templates/datasource-configmap.yaml
index 80e3f2e..d61fa99 100644
--- a/monitoring/grafana-aether/templates/datasource-configmap.yaml
+++ b/monitoring/grafana-aether/templates/datasource-configmap.yaml
@@ -21,6 +21,19 @@
       isDefault: false
       url: {{ .endpoint }}
 {{- end }}
+{{- range .Values.elasticsearchDatasources }}
+    - name: {{ .name }}
+      url: {{ .endpoint }}
+      type: elasticsearch
+      access: proxy
+      database: "[fluentbit-]YYYY.MM.DD"
+      jsonData:
+        interval: Daily
+        timeField: "@timestamp"
+        esVersion: 70
+        logMessageField: log
+        logLevelField: logLevel
+{{- end }}
 {{- if .Values.googleCloudMonitoring }}
     - name: Google Cloud Monitoring
       type: stackdriver
diff --git a/monitoring/grafana-aether/values.yaml b/monitoring/grafana-aether/values.yaml
index 6f77025..3ce1480 100644
--- a/monitoring/grafana-aether/values.yaml
+++ b/monitoring/grafana-aether/values.yaml
@@ -13,7 +13,7 @@
   # - global-edge-status-production.json
   # - sdcore-metrics.json
 
-# Datasources used by the dashboards
+# Prometheus datasources used by the dashboards
 # Names in datasources must match names referenced in dashboards
 prometheusDatasources: []
   # - name: RANCHER_MONITORING_GLOBAL
@@ -21,6 +21,13 @@
   # - name: RANCHER_MONITORING_SDCORE
   #   endpoint: http://rancher-monitoring-prometheus.cattle-monitoring-system.svc.prd.acc.gcp.aetherproject.net:9090
 
+# Elasticsearch datasources used by the logging dashboard
+elasticsearchDatasources: []
+  # - name: acc-gcp1-es
+  #   endpoint: http://opendistro-es-client-service.logging.svc.prd.acc.gcp.aetherproject.net:9200
+  # - name: ace-menlo-es
+  #   endpoint: http://opendistro-es-client-service.logging.svc.prd.menlo.aetherproject.net:9200
+
 # Configure Google Cloud Monitoring datasource
 googleCloudMonitoring: {}
 # clientEmail: grafana@onf-vpn.iam.gserviceaccount.com