Skip to content
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.

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

Grafana Demo #258

Closed
wants to merge 49 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
3368aae
added grafana
Apr 13, 2023
1bee6fd
Added dashboard
Apr 14, 2023
10c4a27
Merge branch 'main' into grafana
Jayclifford345 Apr 17, 2023
ee9ed42
Merge pull request #3 from InfluxCommunity/grafana
Jayclifford345 Apr 17, 2023
b0f5b82
Updated Readme
Apr 18, 2023
d35a50c
Added plugin setup script
Jayclifford345 Apr 19, 2023
6b98907
Update README.md
Jayclifford345 Apr 19, 2023
d6ae119
added new dashboard
Apr 24, 2023
7b0dd7d
updated datasource
Apr 24, 2023
4d2ddf7
added .env file template
Apr 25, 2023
cc2d3df
updated version and env
Apr 26, 2023
cbebe59
updated grafana
Apr 26, 2023
c6a29b7
modified: demo/docker-compose.yml
Apr 26, 2023
3d1de41
updated docker-compose
Apr 26, 2023
6f81094
updated grafana config
Apr 26, 2023
958b743
updated chart to seconds
Apr 28, 2023
16e2d5d
Merge pull request #4 from InfluxCommunity/killercoda
Jayclifford345 Apr 28, 2023
a5a5628
Merge pull request #5 from influxdata/main
Jayclifford345 Apr 28, 2023
1235b3b
updated docker-compose to build
Apr 28, 2023
bacbd26
Merge pull request #6 from influxdata/main
Jayclifford345 May 2, 2023
34e7230
Merge pull request #7 from influxdata/main
Jayclifford345 May 15, 2023
cd4686d
updated otel config
May 17, 2023
7c07583
updated config
May 17, 2023
2d6f22a
chore: drop span metrics from demo config
jacobmarble May 17, 2023
e635e19
chore: drop span metrics from demo config
jacobmarble May 17, 2023
ea41221
chore: revert "chore: drop span metrics from demo config"
jacobmarble May 18, 2023
534a36e
chore: update OpenTelemetry Collector to v0.78.2
jacobmarble May 23, 2023
ccae8d5
chore: update otel go sdk
povilasv May 25, 2023
1e3100f
chore: update OpenTelemetry Collector Contrib to v0.78.0
jacobmarble Jun 1, 2023
7a0a27b
feat(servicegraph): drop internal dependency graph logic
jacobmarble Jun 1, 2023
6a35f96
chore: add arm64 build to CI
jacobmarble Jun 1, 2023
b6f4f9c
chore(jaeger-influxdb): do not log context canceled
jacobmarble Jun 2, 2023
bc75887
chore: update OpenTelemetry and Jaeger
jacobmarble Jun 6, 2023
91826f2
feat(otel2influx): Adds support for DELTA temporality metrics
garry-cairns May 26, 2023
5ac9243
chore(otel2influx): implement configurable span dimensions
jacobmarble Jun 7, 2023
12c68bc
chore(tests): temporary dependency replacements for integration tests
jacobmarble Jun 7, 2023
b140413
feat(jaeger-influxdb): configurable FlightSQL gRPC metadata
jacobmarble Jun 2, 2023
c72e04d
chore(otelcol-influxdb): update OpenTelemetry to v0.79.0
jacobmarble Jun 8, 2023
e0fb267
Merge pull request #11 from influxdata/main
Jayclifford345 Jun 15, 2023
5838eae
chore: separate one-command demo from development demo
jacobmarble Jun 15, 2023
420665f
added .env
Jun 16, 2023
6ba937c
chore: separate one-command demo from development demo
jacobmarble Jun 15, 2023
4a5e1e1
foo
Jun 16, 2023
46d31ad
chore: separate one-command demo from development demo
jacobmarble Jun 15, 2023
5382e54
Merge pull request #12 from influxdata/main
Jayclifford345 Jun 16, 2023
a31c64f
Merge pull request #13 from influxdata/main
Jayclifford345 Jul 17, 2023
2d0089d
Merge pull request #14 from influxdata/main
Jayclifford345 Aug 7, 2023
b91966b
Merge pull request #15 from influxdata/main
Jayclifford345 Oct 12, 2023
1474f5f
Merge pull request #16 from influxdata/main
Jayclifford345 Jan 8, 2024
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 .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
local/

.env-old
plugins
16 changes: 4 additions & 12 deletions demo/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ services:
- ./demo/jaeger-ui-config.json:/jaeger-ui-config.json:ro

jaeger-influxdb:
build:
context: .
dockerfile: jaeger-influxdb/Dockerfile
image: jaeger-influxdb:local
image: jacobmarble/jaeger-influxdb:latest
stop_grace_period: 10s
environment:
LOG_LEVEL: debug
Expand All @@ -32,10 +29,7 @@ services:
env_file:
- .env
hotrod:
build:
context: .
dockerfile: demo/Dockerfile.hotrod
image: hotrod:local
image: jaegertracing/example-hotrod:1.41.0
stop_grace_period: 1s
ports:
- "8080:8080" # web UI
Expand All @@ -48,10 +42,7 @@ services:
command: ["all", "-m", "prometheus"]

otelcol-influxdb:
build:
context: .
dockerfile: otelcol-influxdb/Dockerfile
image: otelcol-influxdb:local
image: jacobmarble/otelcol-influxdb:latest
command: [ "--config", "/config.yml" ]
stop_grace_period: 10s
volumes:
Expand All @@ -71,6 +62,7 @@ services:
- GF_INSTALL_PLUGINS=influxdata-flightsql-datasource
volumes:
- ./demo/grafana/datasources:/etc/grafana/provisioning/datasources
- ./demo/grafana/dashboards:/etc/grafana/provisioning/dashboards
- grafana:/var/lib/grafana/
restart: always
volumes:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
{
"__inputs": [
{
"name": "DS_FLIGHTSQL",
"label": "FlightSQL",
"description": "",
"type": "datasource",
"pluginId": "influxdata-flightsql-datasource",
"pluginName": "FlightSQL"
},
{
"name": "DS_JAEGER",
"label": "Jaeger",
"description": "",
"type": "datasource",
"pluginId": "jaeger",
"pluginName": "Jaeger"
}
],
"__elements": {},
"__requires": [
{
Expand All @@ -35,7 +17,7 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "9.4.7"
"version": "9.5.1"
},
{
"type": "panel",
Expand All @@ -47,7 +29,7 @@
"type": "datasource",
"id": "influxdata-flightsql-datasource",
"name": "FlightSQL",
"version": "0.1.9"
"version": "1.0.1"
},
{
"type": "datasource",
Expand Down Expand Up @@ -106,7 +88,7 @@
{
"datasource": {
"type": "influxdata-flightsql-datasource",
"uid": "${DS_FLIGHTSQL}"
"uid": "FlightSQL"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -151,6 +133,7 @@
},
"id": 2,
"options": {
"cellHeight": "sm",
"footer": {
"countRows": false,
"fields": "",
Expand All @@ -167,12 +150,12 @@
}
]
},
"pluginVersion": "9.4.7",
"pluginVersion": "9.5.1",
"targets": [
{
"datasource": {
"type": "influxdata-flightsql-datasource",
"uid": "${DS_FLIGHTSQL}"
"uid": "FlightSQL"
},
"format": "table",
"queryText": "SELECT DISTINCT(\"service.name\") FROM \"spans\" WHERE $__timeRange(time)",
Expand All @@ -187,7 +170,7 @@
{
"datasource": {
"type": "influxdata-flightsql-datasource",
"uid": "${DS_FLIGHTSQL}"
"uid": "FlightSQL"
},
"fieldConfig": {
"defaults": {
Expand All @@ -199,7 +182,6 @@
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"axisSoftMax": 81776000,
"fillOpacity": 80,
"gradientMode": "none",
"hideFrom": {
Expand Down Expand Up @@ -251,7 +233,7 @@
"options": {
"barRadius": 0,
"barWidth": 0.3,
"colorByField": "duration_nano (lastNotNull)",
"colorByField": "duration (lastNotNull)",
"fullHighlight": false,
"groupWidth": 0.7,
"legend": {
Expand Down Expand Up @@ -279,10 +261,10 @@
{
"datasource": {
"type": "influxdata-flightsql-datasource",
"uid": "${DS_FLIGHTSQL}"
"uid": "FlightSQL"
},
"format": "table",
"queryText": "SELECT \"duration_nano\", \"span_id\" ,time FROM \"spans\" WHERE $__timeRange(time) AND \"service.name\" = '$Service' order by time",
"queryText": "SELECT \"duration_nano\"/ 1000000 as \"duration\", \"span_id\" ,time FROM \"spans\" WHERE $__timeRange(time) AND \"service.name\" = '$Service' order by time",
"rawEditor": true,
"rawQuery": true,
"refId": "A"
Expand All @@ -294,6 +276,12 @@
"id": "groupBy",
"options": {
"fields": {
"duration": {
"aggregations": [
"lastNotNull"
],
"operation": "aggregate"
},
"duration_nano": {
"aggregations": [
"lastNotNull"
Expand All @@ -317,7 +305,7 @@
{
"datasource": {
"type": "influxdata-flightsql-datasource",
"uid": "${DS_FLIGHTSQL}"
"uid": "FlightSQL"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -366,12 +354,12 @@
"showThresholdLabels": false,
"showThresholdMarkers": true
},
"pluginVersion": "9.4.7",
"pluginVersion": "9.5.1",
"targets": [
{
"datasource": {
"type": "influxdata-flightsql-datasource",
"uid": "${DS_FLIGHTSQL}"
"uid": "FlightSQL"
},
"format": "table",
"queryText": "SELECT\n (COUNT(CASE WHEN \"otel.status_code\" = 'Error' THEN 1 END) * 100.0) / COUNT(*) as error_percentage FROM spans\n WHERE $__timeRange(time) AND \"service.name\" = '$Service' ",
Expand All @@ -387,7 +375,7 @@
{
"datasource": {
"type": "jaeger",
"uid": "${DS_JAEGER}"
"uid": "Jaeger"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -442,30 +430,21 @@
{
"datasource": {
"type": "jaeger",
"uid": "${DS_JAEGER}"
"uid": "Jaeger"
},
"queryType": "search",
"refId": "A",
"service": "$Service"
}
],
"title": "Service Latency Histogram",
"transformations": [
{
"id": "partitionByValues",
"options": {
"fields": [
"Trace ID"
]
}
}
],
"transformations": [],
"type": "histogram"
},
{
"datasource": {
"type": "jaeger",
"uid": "${DS_JAEGER}"
"uid": "Jaeger"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -523,6 +502,7 @@
},
"id": 7,
"options": {
"cellHeight": "sm",
"footer": {
"countRows": false,
"fields": "",
Expand All @@ -533,12 +513,12 @@
},
"showHeader": true
},
"pluginVersion": "9.4.7",
"pluginVersion": "9.5.1",
"targets": [
{
"datasource": {
"type": "jaeger",
"uid": "${DS_JAEGER}"
"uid": "Jaeger"
},
"queryType": "search",
"refId": "A",
Expand All @@ -551,7 +531,7 @@
{
"datasource": {
"type": "jaeger",
"uid": "${DS_JAEGER}"
"uid": "Jaeger"
},
"gridPos": {
"h": 8,
Expand All @@ -564,7 +544,7 @@
{
"datasource": {
"type": "jaeger",
"uid": "${DS_JAEGER}"
"uid": "Jaeger"
},
"query": "$TraceID",
"refId": "A"
Expand All @@ -576,7 +556,7 @@
{
"datasource": {
"type": "jaeger",
"uid": "${DS_JAEGER}"
"uid": "Jaeger"
},
"gridPos": {
"h": 16,
Expand All @@ -589,7 +569,7 @@
{
"datasource": {
"type": "jaeger",
"uid": "${DS_JAEGER}"
"uid": "Jaeger"
},
"query": "$TraceID",
"refId": "A"
Expand Down Expand Up @@ -649,13 +629,13 @@
]
},
"time": {
"from": "now-1h",
"from": "now-24h",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "Open Telemetry",
"uid": "jJwDAiE4z",
"version": 6,
"version": 3,
"weekStart": ""
}
24 changes: 24 additions & 0 deletions demo/grafana/dashboards/dashboards.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: 1

providers:
# <string> an unique provider name. Required
- name: 'OpenTelemetry Demo'
# <int> Org id. Default to 1
orgId: 1
# <string> name of the dashboard folder.
folder: 'general'
# <string> folder UID. will be automatically generated if not specified
folderUid: ''
# <string> provider type. Default to 'file'
type: file
# <bool> disable dashboard deletion
disableDeletion: false
# <int> how often Grafana will scan for changed dashboards
updateIntervalSeconds: 10
# <bool> allow updating provisioned dashboards from the UI
allowUiUpdates: true
options:
# <string, required> path to dashboard files on disk. Required when using the 'file' type
path: /etc/grafana/provisioning/dashboards
# <bool> use folder names from filesystem to create folders in Grafana
foldersFromFilesStructure: true
4 changes: 2 additions & 2 deletions demo/grafana/datasources/jaeger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ datasources:
url: http://jaeger-query:16686
readOnly: false
editable: true
isDefault: false
jsonData:
tracesToLogs:
# Field with internal link pointing to a logs data source in Grafana.
Expand All @@ -14,6 +15,5 @@ datasources:
filterByTraceID: true
filterBySpanID: false
nodeGraph:
enableNodeGraph: true

enabled: true