-
Notifications
You must be signed in to change notification settings - Fork 11
Create standalone OpenTelemetry stack and make some minor fixes #38
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
Open
ThijsFeryn
wants to merge
14
commits into
main
Choose a base branch
from
grafana-monitoring-otel
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
10da3c8
Fix tempo config
ThijsFeryn 9050c0b
I don't think we need a Promtail config
ThijsFeryn 6a2b372
Fix Prometheus config
ThijsFeryn 65242b6
Add Loki config
ThijsFeryn 79af29d
Add OTel Collector config
ThijsFeryn 2d68355
Rename plus to enterprise
ThijsFeryn 13e7c65
Fix Grafana datasources
ThijsFeryn 401f300
Fix datasource references in dashboards
ThijsFeryn a9eedd8
Add varnish profile, use otel-collector & other small fixes
ThijsFeryn 352743a
Rename plus to enterprise, use otel-collector & add varnish profile
ThijsFeryn aeb0c32
Remove auth from grafana.ini
ThijsFeryn fefb3c9
Add otel-collector service, introduce varnish profile & other fixes
ThijsFeryn 4ba09ab
Introduce profiles & explain standalone version
ThijsFeryn 6b26f6a
Ignore Varnish Enterprise license file
ThijsFeryn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ | |
| *.deb | ||
| .env | ||
| .DS_Store | ||
| varnish-enterprise.lic | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
11 changes: 0 additions & 11 deletions
11
docker-compose-examples/grafana-monitoring-otel/conf/grafana/grafana.ini
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,3 @@ | ||
| [security] | ||
| admin_user = admin | ||
| admin_password = password | ||
|
|
||
| #[auth] | ||
| #disable_login_form = true | ||
| # | ||
| #[auth.anonymous] | ||
| #enabled = true | ||
| #org_role = Admin | ||
|
|
||
| [dashboards] | ||
| min_refresh_interval = 10s | ||
| default_home_dashboard_path = /etc/grafana/provisioning/dashboards/varnish_metrics.json | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -90,7 +90,7 @@ | |
| "dashes": false, | ||
| "datasource": { | ||
| "type": "loki", | ||
| "uid": "lokiUID" | ||
| "uid": "loki" | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think this need to change, same for all the other changes in this directory |
||
| }, | ||
| "fieldConfig": { | ||
| "defaults": { | ||
|
|
@@ -136,7 +136,7 @@ | |
| { | ||
| "datasource": { | ||
| "type": "loki", | ||
| "uid": "lokiUID" | ||
| "uid": "loki" | ||
| }, | ||
| "expr": "sum(count_over_time({service_name=~\"$app\"} |= \"$search\" [$__interval]))", | ||
| "legendFormat": "", | ||
|
|
@@ -177,7 +177,7 @@ | |
| { | ||
| "datasource": { | ||
| "type": "loki", | ||
| "uid": "lokiUID" | ||
| "uid": "loki" | ||
| }, | ||
| "gridPos": { | ||
| "h": 25, | ||
|
|
@@ -201,7 +201,7 @@ | |
| { | ||
| "datasource": { | ||
| "type": "loki", | ||
| "uid": "lokiUID" | ||
| "uid": "loki" | ||
| }, | ||
| "expr": "{service_name=~\"$app\"} |= \"$search\" | logfmt", | ||
| "hide": false, | ||
|
|
@@ -226,7 +226,7 @@ | |
| }, | ||
| "datasource": { | ||
| "type": "loki", | ||
| "uid": "lokiUID" | ||
| "uid": "loki" | ||
| }, | ||
| "definition": "label_values(service_name)", | ||
| "hide": 0, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pretty sure you need this for
tempoto push metrics toprometheus, but this was a while ago, maybe it has changed