diff --git a/customer/src/main/resources/application.properties b/customer/src/main/resources/application.properties index 10d8cc27c8..d8d821309b 100644 --- a/customer/src/main/resources/application.properties +++ b/customer/src/main/resources/application.properties @@ -2,7 +2,6 @@ server.port=8088 server.servlet.context-path=/customer spring.application.name=customer -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/docker-compose.o11y.yml b/docker-compose.o11y.yml index 4cb832a8d0..a337b43c36 100644 --- a/docker-compose.o11y.yml +++ b/docker-compose.o11y.yml @@ -28,7 +28,7 @@ services: limits: memory: 125M restart: unless-stopped - command: [ "--config=/etc/otelcol-config.yml","--feature-gates=pkg.translator.prometheus.NormalizeName", "--feature-gates=pkg.translator.prometheus.PermissiveLabelSanitization"] + command: [ "--config=/etc/otelcol-config.yml","--feature-gates=pkg.translator.prometheus.NormalizeName"] volumes: - ./docker/otel-collector/otelcol-config.yml:/etc/otelcol-config.yml ports: diff --git a/docker/grafana/provisioning/dashboards/jvm-micrometer.json b/docker/grafana/provisioning/dashboards/jvm-micrometer.json index 8d6a451d85..5e0fbe05f5 100644 --- a/docker/grafana/provisioning/dashboards/jvm-micrometer.json +++ b/docker/grafana/provisioning/dashboards/jvm-micrometer.json @@ -43,7 +43,7 @@ "fiscalYearStartMonth": 0, "gnetId": 4701, "graphTooltip": 1, - "id": 10, + "id": 7, "links": [], "liveNow": false, "panels": [ @@ -1455,6 +1455,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -1465,6 +1466,7 @@ "x": 0, "y": 21 }, + "hiddenSeries": false, "id": 106, "legend": { "avg": false, @@ -1479,7 +1481,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -1528,6 +1534,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "CPU Usage", "tooltip": { "msResolution": false, @@ -1562,7 +1569,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, @@ -1576,6 +1586,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -1586,6 +1597,7 @@ "x": 6, "y": 21 }, + "hiddenSeries": false, "id": 93, "legend": { "avg": false, @@ -1600,7 +1612,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -1635,6 +1651,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Load", "tooltip": { "msResolution": false, @@ -1668,7 +1685,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, @@ -1682,6 +1702,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -1692,6 +1713,7 @@ "x": 12, "y": 21 }, + "hiddenSeries": false, "id": 32, "legend": { "avg": false, @@ -1706,7 +1728,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -1768,6 +1794,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Threads", "tooltip": { "msResolution": false, @@ -1800,7 +1827,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": { @@ -1819,12 +1849,14 @@ "uid": "prometheus" }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 18, "y": 21 }, + "hiddenSeries": false, "id": 124, "legend": { "alignAsTable": false, @@ -1841,7 +1873,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -1863,6 +1899,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Thread States", "tooltip": { "shared": true, @@ -1886,7 +1923,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, @@ -1899,12 +1939,14 @@ }, "description": "The percent of time spent on Garbage Collection over all CPUs assigned to the JVM process.", "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 6, "x": 0, "y": 28 }, + "hiddenSeries": false, "id": 138, "legend": { "avg": false, @@ -1919,7 +1961,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -1941,6 +1987,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "GC Pressure", "tooltip": { "shared": true, @@ -1967,7 +2014,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": { @@ -1987,6 +2037,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -1998,6 +2049,7 @@ "y": 28 }, "height": "", + "hiddenSeries": false, "id": 91, "legend": { "alignAsTable": false, @@ -2016,7 +2068,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": true, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2050,6 +2106,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Log Events", "tooltip": { "msResolution": false, @@ -2082,7 +2139,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, @@ -2096,6 +2156,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -2106,6 +2167,7 @@ "x": 18, "y": 28 }, + "hiddenSeries": false, "id": 61, "legend": { "avg": false, @@ -2120,7 +2182,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2159,6 +2225,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "File Descriptors", "tooltip": { "msResolution": false, @@ -2191,7 +2258,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "collapsed": false, @@ -2232,6 +2302,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -2242,6 +2313,7 @@ "x": 0, "y": 36 }, + "hiddenSeries": false, "id": 3, "legend": { "alignAsTable": false, @@ -2259,7 +2331,11 @@ "links": [], "maxPerRow": 3, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2316,6 +2392,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "$jvm_memory_pool_heap", "tooltip": { "msResolution": false, @@ -2347,7 +2424,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "collapsed": false, @@ -2387,6 +2467,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -2397,6 +2478,7 @@ "x": 0, "y": 44 }, + "hiddenSeries": false, "id": 78, "legend": { "alignAsTable": false, @@ -2414,7 +2496,11 @@ "links": [], "maxPerRow": 3, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2471,6 +2557,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "$jvm_memory_pool_nonheap", "tooltip": { "msResolution": false, @@ -2502,7 +2589,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "collapsed": false, @@ -2540,12 +2630,14 @@ "uid": "prometheus" }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 0, "y": 59 }, + "hiddenSeries": false, "id": 98, "legend": { "avg": false, @@ -2560,7 +2652,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2583,6 +2679,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Collections", "tooltip": { "shared": true, @@ -2608,7 +2705,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, @@ -2620,12 +2720,14 @@ "uid": "prometheus" }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 8, "y": 59 }, + "hiddenSeries": false, "id": 101, "legend": { "avg": false, @@ -2640,7 +2742,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2677,6 +2783,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Pause Durations", "tooltip": { "shared": true, @@ -2702,7 +2809,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, @@ -2714,12 +2824,14 @@ "uid": "prometheus" }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 16, "y": 59 }, + "hiddenSeries": false, "id": 99, "legend": { "avg": false, @@ -2734,7 +2846,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2748,11 +2864,13 @@ "type": "prometheus", "uid": "prometheus" }, + "editorMode": "code", "expr": "rate(jvm_gc_memory_allocated_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])", "format": "time_series", "interval": "", "intervalFactor": 1, "legendFormat": "allocated", + "range": true, "refId": "A" }, { @@ -2769,6 +2887,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Allocated/Promoted", "tooltip": { "shared": true, @@ -2793,7 +2912,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "collapsed": false, @@ -2833,6 +2955,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -2843,6 +2966,7 @@ "x": 0, "y": 67 }, + "hiddenSeries": false, "id": 37, "legend": { "avg": false, @@ -2857,7 +2981,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2881,6 +3009,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Classes loaded", "tooltip": { "msResolution": false, @@ -2912,7 +3041,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "aliasColors": {}, @@ -2926,6 +3058,7 @@ "editable": true, "error": false, "fill": 1, + "fillGradient": 0, "grid": { "leftLogBase": 1, "rightLogBase": 1 @@ -2936,6 +3069,7 @@ "x": 12, "y": 67 }, + "hiddenSeries": false, "id": 38, "legend": { "avg": false, @@ -2950,7 +3084,11 @@ "linewidth": 1, "links": [], "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2976,6 +3114,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Class delta", "tooltip": { "msResolution": false, @@ -3007,7 +3146,10 @@ "logBase": 1, "show": true } - ] + ], + "yaxis": { + "align": false + } }, { "collapsed": false, @@ -3045,12 +3187,14 @@ "uid": "prometheus" }, "fill": 1, + "fillGradient": 0, "gridPos": { "h": 7, "w": 8, "x": 0, "y": 75 }, + "hiddenSeries": false, "id": 131, "legend": { "avg": false, @@ -3066,7 +3210,11 @@ "links": [], "maxPerRow": 3, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -3121,6 +3269,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "$jvm_buffer_pool", "tooltip": { "shared": true, @@ -3148,7 +3297,10 @@ "min": "0", "show": true } - ] + ], + "yaxis": { + "align": false + } } ], "refresh": "30s", @@ -3160,14 +3312,41 @@ { "current": { "selected": false, - "text": "order", - "value": "order" + "text": "yas-msa", + "value": "yas-msa" }, "datasource": { "type": "prometheus", "uid": "prometheus" }, - "definition": "", + "definition": "label_values(service_namespace)", + "hide": 0, + "includeAll": false, + "label": "Namespace", + "multi": false, + "name": "namespace", + "options": [], + "query": { + "query": "label_values(service_namespace)", + "refId": "StandardVariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + }, + { + "current": { + "selected": false, + "text": "backoffice-bff", + "value": "backoffice-bff" + }, + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "definition": "label_values(jvm_memory_used_bytes{service_namespace=\"$namespace\", area=\"heap\"},application)", "hide": 0, "includeAll": false, "label": "Application", @@ -3175,8 +3354,8 @@ "name": "application", "options": [], "query": { - "query": "label_values(application)", - "refId": "Prometheus-application-Variable-Query" + "query": "label_values(jvm_memory_used_bytes{service_namespace=\"$namespace\", area=\"heap\"},application)", + "refId": "StandardVariableQuery" }, "refresh": 2, "regex": "", @@ -3318,7 +3497,7 @@ ] }, "time": { - "from": "now-24h", + "from": "now-5m", "to": "now" }, "timepicker": { @@ -3349,7 +3528,7 @@ }, "timezone": "browser", "title": "JVM (Micrometer)", - "uid": "MueJT2GIz", - "version": 2, + "uid": "MueJT2GIz1", + "version": 8, "weekStart": "" } \ No newline at end of file diff --git a/docker/otel-collector/otelcol-config.yml b/docker/otel-collector/otelcol-config.yml index 7278a2416d..895091f41d 100644 --- a/docker/otel-collector/otelcol-config.yml +++ b/docker/otel-collector/otelcol-config.yml @@ -15,7 +15,7 @@ exporters: prometheus: endpoint: collector:9464 # enable_open_metrics: true - add_metric_suffixes: false + # add_metric_suffixes: false resource_to_telemetry_conversion: enabled: true # Convert resource attributes to metric labels otlp: diff --git a/inventory/src/main/resources/application.properties b/inventory/src/main/resources/application.properties index 5004a4aed3..5ba6805c83 100644 --- a/inventory/src/main/resources/application.properties +++ b/inventory/src/main/resources/application.properties @@ -2,7 +2,6 @@ server.port=8090 server.servlet.context-path=/inventory spring.application.name=inventory -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/location/src/main/resources/application.properties b/location/src/main/resources/application.properties index 6f108e3aeb..d3a4fd66bc 100644 --- a/location/src/main/resources/application.properties +++ b/location/src/main/resources/application.properties @@ -2,7 +2,6 @@ server.port=8086 server.servlet.context-path=/location spring.application.name=location -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/media/src/main/resources/application.properties b/media/src/main/resources/application.properties index 515312d3a6..cb542df105 100644 --- a/media/src/main/resources/application.properties +++ b/media/src/main/resources/application.properties @@ -6,7 +6,6 @@ spring.datasource.username=admin spring.datasource.password=admin spring.application.name=media -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/payment-paypal/src/main/resources/application.properties b/payment-paypal/src/main/resources/application.properties index 72d8c9ba7a..fcd2c21da8 100644 --- a/payment-paypal/src/main/resources/application.properties +++ b/payment-paypal/src/main/resources/application.properties @@ -2,7 +2,6 @@ server.port=8093 server.servlet.context-path=/payment-paypal spring.application.name=payment-paypal -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/payment/src/main/resources/application.properties b/payment/src/main/resources/application.properties index e774bc3a6c..a8ca8a82dc 100644 --- a/payment/src/main/resources/application.properties +++ b/payment/src/main/resources/application.properties @@ -2,7 +2,6 @@ server.port=8081 server.servlet.context-path=/payment spring.application.name=payment -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/payment/src/test/resources/application.properties b/payment/src/test/resources/application.properties index 64ce98bc36..9711718f00 100644 --- a/payment/src/test/resources/application.properties +++ b/payment/src/test/resources/application.properties @@ -3,7 +3,6 @@ server.servlet.context-path=/v1 spring.application.name=payment server.port=8081 -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/product/src/main/resources/application.properties b/product/src/main/resources/application.properties index 53383a72c4..50d421718f 100644 --- a/product/src/main/resources/application.properties +++ b/product/src/main/resources/application.properties @@ -2,7 +2,6 @@ server.port=8080 server.servlet.context-path=/product spring.application.name=product -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/promotion/src/main/resources/application.properties b/promotion/src/main/resources/application.properties index 7891ca61fa..e2a5da2542 100644 --- a/promotion/src/main/resources/application.properties +++ b/promotion/src/main/resources/application.properties @@ -2,7 +2,6 @@ server.port=8092 server.servlet.context-path=/promotion spring.application.name=promotion -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/rating/src/main/resources/application.properties b/rating/src/main/resources/application.properties index fb91ef73a7..7b2c0a0b14 100644 --- a/rating/src/main/resources/application.properties +++ b/rating/src/main/resources/application.properties @@ -2,7 +2,6 @@ server.port=8089 server.servlet.context-path=/rating spring.application.name=rating -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/search/src/main/resources/application.properties b/search/src/main/resources/application.properties index 30696f1f63..74d83b18a2 100644 --- a/search/src/main/resources/application.properties +++ b/search/src/main/resources/application.properties @@ -6,7 +6,6 @@ server.port=8092 server.servlet.context-path=/search spring.application.name=search -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true diff --git a/tax/src/main/resources/application.properties b/tax/src/main/resources/application.properties index a0d4139d32..4145b68871 100644 --- a/tax/src/main/resources/application.properties +++ b/tax/src/main/resources/application.properties @@ -2,7 +2,7 @@ server.port=8091 server.servlet.context-path=/tax spring.application.name=tax -management.otlp.tracing.endpoint=http://tempo:4318/v1/traces + management.tracing.sampling.probability=1.0 management.endpoints.web.exposure.include=prometheus management.metrics.distribution.percentiles-histogram.http.server.requests=true