(grafana): update grafana dashboards (open-telemetry#1150)

* update grafana dashboards

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update grafana dashboards

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Austin Parker <austin@ap2.io>

CHANGELOG.md

@@ -21,6 +21,8 @@ release.
   ([#1146](https://github.com/open-telemetry/opentelemetry-demo/pull/1146))
 * [prometheus] Enabled support for the OTLP write receiver
   ([#1149](https://github.com/open-telemetry/opentelemetry-demo/pull/1149))
+* [grafana] fix dashboard metric names and update settings
+  ([#1150](https://github.com/open-telemetry/opentelemetry-demo/pull/1150))
 * [otelcol] add httpcheck receiver for synthetic check of frontendproxy
   ([#1162](https://github.com/open-telemetry/opentelemetry-demo/pull/1162))
 

docker-compose.oracle.yml

@@ -0,0 +1,186 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+version: '3.9'
+x-default-logging: &logging
+  driver: "json-file"
+  options:
+    max-size: "5m"
+    max-file: "2"
+
+networks:
+  default:
+    name: opentelemetry-demo
+    driver: bridge
+
+services:
+
+  # # ******************
+  # # Dependent Services
+  # # ******************
+  # # Postgres used by Feature Flag service
+  # ffs_postgres:
+  #   image: postgres:16.0
+  #   container_name: postgres
+  #   user: postgres
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         memory: 120M
+  #   restart: unless-stopped
+  #   environment:
+  #     - POSTGRES_USER=ffs
+  #     - POSTGRES_DB=ffs
+  #     - POSTGRES_PASSWORD=ffs
+  #   healthcheck:
+  #     test: ["CMD-SHELL", "pg_isready -d ffs -U ffs"]
+  #     interval: 10s
+  #     timeout: 5s
+  #     retries: 5
+  #   logging: *logging
+
+  # # Kafka used by Checkout, Accounting, and Fraud Detection services
+  # kafka:
+  #   image: ${IMAGE_NAME}:${IMAGE_VERSION}-kafka
+  #   container_name: kafka
+  #   build:
+  #     context: ./
+  #     dockerfile: ./src/kafka/Dockerfile
+  #     cache_from:
+  #       - ${IMAGE_NAME}:${IMAGE_VERSION}-kafka
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         memory: 500M
+  #   restart: unless-stopped
+  #   environment:
+  #     - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
+  #     - OTEL_EXPORTER_OTLP_ENDPOINT
+  #     - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+  #     - OTEL_RESOURCE_ATTRIBUTES
+  #     - OTEL_SERVICE_NAME=kafka
+  #     - KAFKA_HEAP_OPTS=-Xmx200m -Xms200m
+  #   healthcheck:
+  #     test: nc -z kafka 9092
+  #     start_period: 10s
+  #     interval: 5s
+  #     timeout: 10s
+  #     retries: 10
+  #   logging: *logging
+
+  # # Redis used by Cart service
+  # redis-cart:
+  #   image: redis:7.2-alpine
+  #   container_name: redis-cart
+  #   user: redis
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         memory: 20M
+  #   restart: unless-stopped
+  #   ports:
+  #     - "${REDIS_PORT}"
+  #   logging: *logging
+
+  oracle:
+    image: gvenzl/oracle-xe:21-slim-faststart
+    build:
+      dockerfile: ./src/oracle/Dockerfile
+    environment:
+      - ORACLE_PASSWORD=password
+      - APP_USER=otel
+      - APP_USER_PASSWORD=password
+    ports:
+      - "1521:1521"
+    healthcheck:
+      test: ["CMD", "healthcheck.sh"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    logging: *logging
+
+
+  # ********************
+  # Telemetry Components
+  # ********************
+  # OpenTelemetry Collector
+  otelcol:
+    image: otel/opentelemetry-collector-contrib:0.86.0
+    container_name: otel-col
+    deploy:
+      resources:
+        limits:
+          memory: 125M
+    restart: unless-stopped
+    command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-observability.yml", "--config=/etc/otelcol-config-extras.yml" ]
+    volumes:
+      - ./src/otelcollector/oracle/otelcol-config.yml:/etc/otelcol-config.yml
+      - ./src/otelcollector/oracle/otelcol-observability.yml:/etc/otelcol-observability.yml
+      - ./src/otelcollector/oracle/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml
+    ports:
+      - "4317"          # OTLP over gRPC receiver
+      - "4318:4318"     # OTLP over HTTP receiver
+      - "9464"          # Prometheus exporter
+      - "8888"          # metrics endpoint
+    logging: *logging
+    environment:
+      - ENVOY_PORT
+    depends_on:
+      oracle:
+        condition: service_healthy
+
+  # # Prometheus
+  # prometheus:
+  #   image: quay.io/prometheus/prometheus:v2.47.0
+  #   container_name: prometheus
+  #   command:
+  #     - --web.console.templates=/etc/prometheus/consoles
+  #     - --web.console.libraries=/etc/prometheus/console_libraries
+  #     - --storage.tsdb.retention.time=1h
+  #     - --config.file=/etc/prometheus/prometheus-config.yaml
+  #     - --storage.tsdb.path=/prometheus
+  #     - --web.enable-lifecycle
+  #     - --web.route-prefix=/
+  #     - --enable-feature=exemplar-storage
+  #     - --enable-feature=otlp-write-receiver
+  #   volumes:
+  #     - ./src/prometheus/prometheus-config.yaml:/etc/prometheus/prometheus-config.yaml
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         memory: 300M
+  #   ports:
+  #     - "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}"
+  #   logging: *logging
+
+  # opensearch:
+  #   image: opensearchproject/opensearch:latest
+  #   container_name: opensearch
+  #   environment:
+  #     - cluster.name=demo-cluster
+  #     - node.name=demo-node
+  #     - bootstrap.memory_lock=true
+  #     - discovery.type=single-node
+  #     - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
+  #     - "DISABLE_INSTALL_DEMO_CONFIG=true"
+  #     - "DISABLE_SECURITY_PLUGIN=true"
+  #   ulimits:
+  #     memlock:
+  #       soft: -1
+  #       hard: -1
+  #     nofile:
+  #       soft: 65536
+  #       hard: 65536
+  #   ports:
+  #     - "9200:9200"
+  #   logging: *logging
+
+  # dataprepper:
+  #   image: opensearchproject/data-prepper:latest
+  #   volumes:
+  #     - ./src/opensearch/pipelines.yaml:/usr/share/data-prepper/pipelines/pipelines.yaml
+  #     - ./src/opensearch/data-prepper-config.yaml:/usr/share/data-prepper/config/data-prepper-config.yaml
+  #   ports:
+  #     - "21892"
+  #   logging: *logging
+

src/grafana/provisioning/dashboards/general.yaml → src/grafana/provisioning/dashboards/demo.yaml

@@ -11,4 +11,4 @@ providers:
     disableDeletion: false
     editable: true
     options:
-      path: /etc/grafana/provisioning/dashboards/general
+      path: /etc/grafana/provisioning/dashboards/demo