Skip to content

Update to 3.0.0 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update to 3.0.0 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
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_EUM_VERSION=3.0.0-RC1
INSPECTIT_PETCLINIC_VERSION=1.3
INSPECTIT_LOAD_VERSION=2.0

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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).
32 changes: 14 additions & 18 deletions grafana/provisioning/prometheus/dashboards/eum-server/Beacons.json
View file
Open in desktop
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": ""
}
70 changes: 36 additions & 34 deletions grafana/provisioning/prometheus/dashboards/eum-server/Traces.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
},
Expand All @@ -40,10 +40,6 @@
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
Expand Down Expand Up @@ -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"
}
],
Expand All @@ -95,7 +92,7 @@
},
{
"datasource": {
"name": "${datasource}",
"default": false,
"type": "prometheus",
"uid": "${datasource}"
},
Expand All @@ -111,10 +108,6 @@
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
},
Expand All @@ -136,7 +129,9 @@
"orientation": "auto",
"percentChangeColorMode": "standard",
"reduceOptions": {
"calcs": [],
"calcs": [
"mean"
],
"fields": "",
"values": false
},
Expand All @@ -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,
Expand All @@ -165,7 +161,7 @@
},
{
"datasource": {
"name": "${datasource}",
"default": false,
"type": "prometheus",
"uid": "${datasource}"
},
Expand All @@ -184,9 +180,13 @@
"color": "green",
"value": null
},
{
"color": "yellow",
"value": 1
},
{
"color": "red",
"value": 80
"value": 10
}
]
},
Expand Down Expand Up @@ -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"
}
],
Expand Down Expand Up @@ -278,7 +279,7 @@
},
{
"datasource": {
"name": "${datasource}",
"default": false,
"type": "prometheus",
"uid": "${datasource}"
},
Expand Down Expand Up @@ -334,7 +335,7 @@
}
]
},
"unit": "short"
"unit": "none"
},
"overrides": []
},
Expand Down Expand Up @@ -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"
Expand All @@ -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",
Expand All @@ -390,7 +392,7 @@
},
{
"datasource": {
"name": "${datasource}",
"default": false,
"type": "prometheus",
"uid": "${datasource}"
},
Expand All @@ -416,7 +418,7 @@
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineInterpolation": "stepAfter",
"lineWidth": 0,
"pointSize": 5,
"scaleDistribution": {
Expand Down Expand Up @@ -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"
}
Expand All @@ -489,7 +491,7 @@
},
{
"datasource": {
"name": "${datasource}",
"default": false,
"type": "prometheus",
"uid": "${datasource}"
},
Expand Down Expand Up @@ -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"
}
Expand Down Expand Up @@ -620,7 +622,7 @@
"timepicker": {},
"timezone": "",
"title": "Trace Controller",
"uid": "-Lqc_TRnk",
"version": 3,
"uid": "-Lac_TBnh",
"version": 11,
"weekStart": ""
}
2 changes: 1 addition & 1 deletion prometheus/prometheus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# my global config
global:
scrape_interval: 1s
scrape_interval: 5s

scrape_configs:
- job_name: inspectit
Expand Down