Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# inspectIT versions
INSPECTIT_OCELOT_VERSION=2.7.0
INSPECTIT_OCELOT_EUM_VERSION=2.7.0
INSPECTIT_OCELOT_VERSION=3.0.0-RC1
INSPECTIT_OCELOT_EUM_VERSION=3.0.0-RC2
INSPECTIT_PETCLINIC_VERSION=1.3
INSPECTIT_LOAD_VERSION=2.0

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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).
24 changes: 12 additions & 12 deletions grafana/provisioning/prometheus/dashboards/agent/http-overview.json
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(increase(http_in_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) > 0",
"expr": "sum(increase(http_in_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -268,7 +268,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(increase(http_in_responsetime_sum_milliseconds_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) \n/ sum(increase(http_in_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) > 0",
"expr": "sum(increase(http_in_responsetime_milliseconds_sum{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) \n/ sum(increase(http_in_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -282,7 +282,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "(sum(increase(http_in_count_ratio_total{http_status!~\"(1|2|3)\\\\d\\\\d\",service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) \n/ sum(increase(http_in_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path)) >= 0\nor (sum(increase(http_in_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) > 0) * 0",
"expr": "(sum(increase(http_in_responsetime_milliseconds_count{http_status!~\"(1|2|3)\\\\d\\\\d\",service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) \n/ sum(increase(http_in_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path)) >= 0\nor (sum(increase(http_in_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) > 0) * 0",
"format": "table",
"instant": true,
"interval": "",
Expand Down Expand Up @@ -393,7 +393,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "(sum(increase(http_in_responsetime_sum_milliseconds_total{service_name=\"$service\",http_path=~\"$path\"}[$__interval])) by (http_path)\n/ sum(increase(http_in_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__interval])) by (http_path)) >= 0",
"expr": "(sum(increase(http_in_responsetime_milliseconds_sum{service_name=\"$service\",http_path=~\"$path\"}[$__interval])) by (http_path)\n/ sum(increase(http_in_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__interval])) by (http_path)) >= 0",
"format": "time_series",
"instant": false,
"interval": "",
Expand Down Expand Up @@ -481,7 +481,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(rate(http_in_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__interval]))",
"expr": "sum(rate(http_in_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__interval]))",
"format": "time_series",
"instant": false,
"interval": "",
Expand Down Expand Up @@ -573,7 +573,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "(sum(increase(http_in_count_ratio_total{http_status!~\"(1|2|3)\\\\d\\\\d\",service_name=\"$service\",http_path=~\"$path\"}[$__range]))\n/ sum(increase(http_in_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) >= 0)\nor (sum(increase(http_in_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) > 0) * 0",
"expr": "(sum(increase(http_in_responsetime_milliseconds_count{http_status!~\"(1|2|3)\\\\d\\\\d\",service_name=\"$service\",http_path=~\"$path\"}[$__range]))\n/ sum(increase(http_in_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) >= 0)\nor (sum(increase(http_in_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) > 0) * 0",
"format": "time_series",
"instant": true,
"interval": "",
Expand Down Expand Up @@ -838,7 +838,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(label_join(increase(http_out_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range]), \"http_url\", \"\", \"http_host\", \"http_path\")) by (http_url) > 0",
"expr": "sum(label_join(increase(http_out_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range]), \"http_url\", \"\", \"http_host\", \"http_path\")) by (http_url) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -852,7 +852,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "label_join(sum(increase(http_out_responsetime_sum_milliseconds_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_host,http_path) \n/ sum(increase(http_out_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_host,http_path) > 0, \"http_url\", \"\", \"http_host\", \"http_path\")",
"expr": "label_join(sum(increase(http_out_responsetime_milliseconds_sum{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_host,http_path) \n/ sum(increase(http_out_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_host,http_path) > 0, \"http_url\", \"\", \"http_host\", \"http_path\")",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -867,7 +867,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "label_join((sum(increase(http_out_count_ratio_total{http_status!~\"(1|2|3)\\\\d\\\\d\",service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) \n/ sum(increase(http_out_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_host,http_path)) >= 0\nor (sum(increase(http_out_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_host,http_path) > 0) * 0 , \"http_url\", \"\", \"http_host\", \"http_path\")",
"expr": "label_join((sum(increase(http_out_responsetime_milliseconds_count{http_status!~\"(1|2|3)\\\\d\\\\d\",service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_path) \n/ sum(increase(http_out_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_host,http_path)) >= 0\nor (sum(increase(http_out_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) by (http_host,http_path) > 0) * 0 , \"http_url\", \"\", \"http_host\", \"http_path\")",
"format": "table",
"hide": false,
"instant": true,
Expand Down Expand Up @@ -982,7 +982,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "(sum(increase(http_out_responsetime_sum_milliseconds_total{service_name=\"$service\",http_path=~\"$path\"}[$__interval])) by (http_host,http_path)\n/ sum(increase(http_out_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__interval])) by (http_host,http_path)) >= 0",
"expr": "(sum(increase(http_out_responsetime_milliseconds_sum{service_name=\"$service\",http_path=~\"$path\"}[$__interval])) by (http_host,http_path)\n/ sum(increase(http_out_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__interval])) by (http_host,http_path)) >= 0",
"format": "time_series",
"instant": false,
"interval": "",
Expand Down Expand Up @@ -1070,7 +1070,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(rate(http_out_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__interval]))",
"expr": "sum(rate(http_out_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__interval]))",
"format": "time_series",
"instant": false,
"interval": "",
Expand Down Expand Up @@ -1162,7 +1162,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "(sum(increase(http_out_count_ratio_total{http_status!~\"(1|2|3)\\\\d\\\\d\",service_name=\"$service\",http_path=~\"$path\"}[$__range]))\n/ sum(increase(http_out_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) >= 0)\nor (sum(increase(http_out_count_ratio_total{service_name=\"$service\",http_path=~\"$path\"}[$__range])) > 0) * 0",
"expr": "(sum(increase(http_out_responsetime_milliseconds_count{http_status!~\"(1|2|3)\\\\d\\\\d\",service_name=\"$service\",http_path=~\"$path\"}[$__range]))\n/ sum(increase(http_out_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) >= 0)\nor (sum(increase(http_out_responsetime_milliseconds_count{service_name=\"$service\",http_path=~\"$path\"}[$__range])) > 0) * 0",
"format": "time_series",
"instant": true,
"interval": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": 5,
"id": 2,
"links": [],
"liveNow": false,
"panels": [
Expand Down Expand Up @@ -167,7 +167,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(increase(service_in_count_ratio_total{service_name=~\"$service\"}[$__range]) or increase(service_in_count_ratio_total{origin_service=~\"$service\"}[$__range]) >= 0) by (service_name,origin_service,origin_external,protocol) > 0",
"expr": "sum(increase(service_in_responsetime_milliseconds_count{service_name=~\"$service\"}[$__range]) or increase(service_in_responsetime_milliseconds_count{origin_service=~\"$service\"}[$__range]) >= 0) by (service_name,origin_service,origin_external,protocol) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -181,7 +181,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(increase(service_out_count_ratio_total{service_name=~\"$service\"}[$__range]) or increase(service_out_count_ratio_total{target_service=~\"$service\"}[$__range]) >= 0) by (service_name,target_service,target_external,protocol) > 0",
"expr": "sum(increase(service_out_responsetime_milliseconds_count{service_name=~\"$service\"}[$__range]) or increase(service_out_responsetime_milliseconds_count{target_service=~\"$service\"}[$__range]) >= 0) by (service_name,target_service,target_external,protocol) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -195,7 +195,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(increase(service_in_responsetime_sum_milliseconds_total{service_name=~\"$service\"}[$__range]) or increase(service_in_responsetime_sum_milliseconds_total{origin_service=~\"$service\"}[$__range]) >= 0) by (service_name,origin_service,origin_external,protocol) > 0",
"expr": "sum(increase(service_in_responsetime_milliseconds_sum{service_name=~\"$service\"}[$__range]) or increase(service_in_responsetime_milliseconds_sum{origin_service=~\"$service\"}[$__range]) >= 0) by (service_name,origin_service,origin_external,protocol) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -209,7 +209,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(increase(service_out_responsetime_sum_milliseconds_total{service_name=~\"$service\"}[$__range]) or increase(service_out_responsetime_sum_milliseconds_total{target_service=~\"$service\"}[$__range]) >= 0) by (service_name,target_service,target_external,protocol) > 0",
"expr": "sum(increase(service_out_responsetime_milliseconds_sum{service_name=~\"$service\"}[$__range]) or increase(service_out_responsetime_milliseconds_sum{target_service=~\"$service\"}[$__range]) >= 0) by (service_name,target_service,target_external,protocol) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -223,7 +223,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(increase(service_in_count_ratio_total{service_name=~\"$service\",error=\"true\"}[$__range]) or increase(service_in_count_ratio_total{origin_service=~\"$service\",error=\"true\"}[$__range]) >= 0) by (service_name,origin_service,origin_external,protocol) > 0",
"expr": "sum(increase(service_in_responsetime_milliseconds_count{service_name=~\"$service\",error=\"true\"}[$__range]) or increase(service_in_responsetime_milliseconds_count{origin_service=~\"$service\",error=\"true\"}[$__range]) >= 0) by (service_name,origin_service,origin_external,protocol) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -236,7 +236,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(increase(service_out_count_ratio_total{service_name=~\"$service\",error=\"true\"}[$__range]) or increase(service_out_count_ratio_total{target_service=~\"$service\",error=\"true\"}[$__range]) >= 0) by (service_name,target_service,target_external,protocol) > 0",
"expr": "sum(increase(service_out_responsetime_milliseconds_count{service_name=~\"$service\",error=\"true\"}[$__range]) or increase(service_out_responsetime_milliseconds_count{target_service=~\"$service\",error=\"true\"}[$__range]) >= 0) by (service_name,target_service,target_external,protocol) > 0",
"format": "table",
"instant": true,
"interval": "",
Expand Down
32 changes: 14 additions & 18 deletions grafana/provisioning/prometheus/dashboards/eum-server/Beacons.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
},
Expand All @@ -39,10 +39,6 @@
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
Expand Down Expand Up @@ -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"
}
],
Expand All @@ -95,7 +91,7 @@
},
{
"datasource": {
"name": "${datasource}",
"default": false,
"type": "prometheus",
"uid": "${datasource}"
},
Expand All @@ -114,7 +110,7 @@
},
{
"color": "red",
"value": 80
"value": 50
}
]
},
Expand Down Expand Up @@ -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,
Expand All @@ -177,7 +173,7 @@
},
{
"datasource": {
"name": "${datasource}",
"default": false,
"type": "prometheus",
"uid": "${datasource}"
},
Expand Down Expand Up @@ -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,
Expand All @@ -276,7 +272,7 @@
},
{
"datasource": {
"name": "${datasource}",
"default": false,
"type": "prometheus",
"uid": "${datasource}"
},
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -434,7 +430,7 @@
"timepicker": {},
"timezone": "",
"title": "Beacons",
"uid": "f6YQCSqGk",
"version": 3,
"uid": "f5ZQCSqGk",
"version": 9,
"weekStart": ""
}
Loading