diff --git a/.env b/.env index 18c3f79..11e641d 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ # inspectIT versions INSPECTIT_OCELOT_VERSION=2.7.0 -INSPECTIT_OCELOT_EUM_VERSION=2.7.0 +INSPECTIT_OCELOT_EUM_VERSION=3.0.0-RC1 INSPECTIT_PETCLINIC_VERSION=1.3 INSPECTIT_LOAD_VERSION=2.0 diff --git a/README.md b/README.md index bae1bff..e512278 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # inspectIT Ocelot - Demo -This project provides a comprehensive demonstration of the capabilities of the inspectIT Ocelot Java agent using different infrastructure architectures. +This project provides a comprehensive demonstration of the capabilities of the inspectIT Ocelot using different infrastructure architectures. A detailed description of each existing scenario can be found in the [documentation](https://inspectit.github.io/inspectit-ocelot/docs/getting-started/docker-examples). diff --git a/grafana/provisioning/prometheus/dashboards/eum-server/Beacons.json b/grafana/provisioning/prometheus/dashboards/eum-server/Beacons.json index baf82b4..154342a 100644 --- a/grafana/provisioning/prometheus/dashboards/eum-server/Beacons.json +++ b/grafana/provisioning/prometheus/dashboards/eum-server/Beacons.json @@ -18,12 +18,12 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 5, + "id": 8, "links": [], "panels": [ { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -39,10 +39,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -83,10 +79,10 @@ }, "editorMode": "code", "exemplar": false, - "expr": "inspectit_eum_self_beacons_received_count", - "instant": false, + "expr": "sum(inspectit_eum_self_beacons_received_amount_total)", + "instant": true, "legendFormat": "__auto", - "range": true, + "range": false, "refId": "A" } ], @@ -95,7 +91,7 @@ }, { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -114,7 +110,7 @@ }, { "color": "red", - "value": 80 + "value": 50 } ] }, @@ -153,7 +149,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "avg(sum_over_time(inspectit_eum_self_beacons_processor_duration_sum[$__interval]) / sum_over_time(inspectit_eum_self_beacons_processor_count[$__interval]))", + "expr": "avg(rate(inspectit_eum_self_beacons_processor_amount_sum[$__rate_interval]) / rate(inspectit_eum_self_beacons_processor_amount_count[$__rate_interval]))", "instant": false, "legendFormat": "__auto", "range": true, @@ -177,7 +173,7 @@ }, { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -264,7 +260,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "avg_over_time(inspectit_eum_self_beacons_processor_duration_sum[$__interval]) / avg_over_time(inspectit_eum_self_beacons_processor_count[$__interval])", + "expr": "rate(inspectit_eum_self_beacons_processor_amount_sum[$__rate_interval]) / rate(inspectit_eum_self_beacons_processor_amount_count[$__rate_interval])", "instant": false, "legendFormat": "{{beacon_processor}}", "range": true, @@ -276,7 +272,7 @@ }, { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -353,7 +349,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "avg_over_time(inspectit_eum_self_beacons_processor_duration_sum[$__interval]) / avg_over_time(inspectit_eum_self_beacons_processor_count[$__interval])", + "expr": "rate(inspectit_eum_self_beacons_processor_amount_sum[$__rate_interval]) / rate(inspectit_eum_self_beacons_processor_amount_count[$__rate_interval])", "instant": false, "legendFormat": "{{beacon_processor}}", "range": true, @@ -434,7 +430,7 @@ "timepicker": {}, "timezone": "", "title": "Beacons", - "uid": "f6YQCSqGk", - "version": 3, + "uid": "f5ZQCSqGk", + "version": 9, "weekStart": "" } \ No newline at end of file diff --git a/grafana/provisioning/prometheus/dashboards/eum-server/Traces.json b/grafana/provisioning/prometheus/dashboards/eum-server/Traces.json index f2ae7a8..5a96b94 100644 --- a/grafana/provisioning/prometheus/dashboards/eum-server/Traces.json +++ b/grafana/provisioning/prometheus/dashboards/eum-server/Traces.json @@ -18,12 +18,12 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 6, + "id": 1, "links": [], "panels": [ { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -40,10 +40,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] } @@ -83,10 +79,11 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "inspectit_eum_self_traces_received_count", - "instant": false, + "exemplar": false, + "expr": "inspectit_eum_self_traces_received_amount_count", + "instant": true, "legendFormat": "__auto", - "range": true, + "range": false, "refId": "A" } ], @@ -95,7 +92,7 @@ }, { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -111,10 +108,6 @@ { "color": "green", "value": null - }, - { - "color": "red", - "value": 80 } ] }, @@ -136,7 +129,9 @@ "orientation": "auto", "percentChangeColorMode": "standard", "reduceOptions": { - "calcs": [], + "calcs": [ + "mean" + ], "fields": "", "values": false }, @@ -153,7 +148,8 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "avg_over_time(inspectit_eum_self_traces_received_duration_sum[$__interval]) / avg_over_time(inspectit_eum_self_traces_received_count[$__interval])", + "exemplar": false, + "expr": "rate(inspectit_eum_self_traces_received_amount_sum[$__rate_interval]) / rate(inspectit_eum_self_traces_received_amount_count[$__rate_interval])", "instant": false, "legendFormat": "__auto", "range": true, @@ -165,7 +161,7 @@ }, { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -184,9 +180,13 @@ "color": "green", "value": null }, + { + "color": "yellow", + "value": 1 + }, { "color": "red", - "value": 80 + "value": 10 } ] }, @@ -227,10 +227,11 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "inspectit_eum_self_traces_received_count{is_error=\"true\"}", - "instant": false, + "exemplar": false, + "expr": "inspectit_eum_self_traces_received_amount_count{is_error=\"true\"}", + "instant": true, "legendFormat": "__auto", - "range": true, + "range": false, "refId": "A" } ], @@ -278,7 +279,7 @@ }, { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -334,7 +335,7 @@ } ] }, - "unit": "short" + "unit": "none" }, "overrides": [] }, @@ -365,8 +366,9 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "inspectit_eum_self_traces_received_count{is_error=\"false\"}", + "expr": "rate(inspectit_eum_self_traces_received_amount_count{is_error=\"false\"}[$__rate_interval])", "instant": false, + "interval": "", "legendFormat": "Successful Traces", "range": true, "refId": "A" @@ -377,7 +379,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "inspectit_eum_self_traces_received_count{is_error=\"true\"}", + "expr": "rate(inspectit_eum_self_traces_received_amount_count{is_error=\"true\"}[$__rate_interval])", "hide": false, "instant": false, "legendFormat": "Errors", @@ -390,7 +392,7 @@ }, { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -416,7 +418,7 @@ "viz": false }, "insertNulls": false, - "lineInterpolation": "linear", + "lineInterpolation": "stepAfter", "lineWidth": 0, "pointSize": 5, "scaleDistribution": { @@ -477,9 +479,9 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "avg_over_time(inspectit_eum_self_traces_received_duration_sum[$__interval]) / avg_over_time(inspectit_eum_self_traces_received_count[$__interval])", + "expr": "rate(inspectit_eum_self_traces_received_amount_sum[$__rate_interval]) / rate(inspectit_eum_self_traces_received_amount_count[$__rate_interval])", "instant": false, - "legendFormat": "__auto", + "legendFormat": "Avg. Duration", "range": true, "refId": "A" } @@ -489,7 +491,7 @@ }, { "datasource": { - "name": "${datasource}", + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -576,9 +578,9 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "inspectit_eum_self_traces_span_size_sum", + "expr": "rate(inspectit_eum_self_traces_span_size_amount_total[$__rate_interval])", "instant": false, - "legendFormat": "__auto", + "legendFormat": "Spans per request", "range": true, "refId": "A" } @@ -620,7 +622,7 @@ "timepicker": {}, "timezone": "", "title": "Trace Controller", - "uid": "-Lqc_TRnk", - "version": 3, + "uid": "-Lac_TBnh", + "version": 11, "weekStart": "" } \ No newline at end of file diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 1491436..7ceaa4e 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -1,6 +1,6 @@ # my global config global: - scrape_interval: 1s + scrape_interval: 5s scrape_configs: - job_name: inspectit