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.

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

Jump to bottom

Swap back to upstream #5

Merged
merged 4 commits into from
Nov 11, 2023
Merged

Swap back to upstream #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cfcb08
Dockerfile: Swap back to upstream
USA-RedDragon Nov 11, 2023
3b380d2
README: remove fork note
USA-RedDragon Nov 11, 2023
37cbdd9
Dashboard: Fix time unit for request latencies, and add proper average
USA-RedDragon Nov 11, 2023
2c42d28
Docker: use upstream `edge` tag
USA-RedDragon Nov 11, 2023
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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN git clone https://github.com/jupp0r/prometheus-cpp -b ${PROMETHEUS_CPP_VERSI
cd - && \
rm -rf /tmp/prometheus-cpp

FROM ghcr.io/usa-reddragon/trunk-recorder:main@sha256:bc831c286783e92b7e5cfbceeca94e3965f12ed1d6c61c7665080023b8ae6633
FROM robotastic/trunk-recorder:edge@sha256:5911bc9d338738da5aeaf8a4c4a8e6cc07a595df4a3f51db4c7c44b61e285e2a

COPY --from=prometheus-cpp-builder /prometheus-cpp.deb /tmp/prometheus-cpp.deb
RUN apt update && export DEBIAN_FRONTEND=noninteractive && \
Expand Down
4 changes: 0 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

This is a plugin for Trunk Recorder that publishes metrics in Prometheus format.

## Fork note

This uses [a fork of Trunk Recorder](https://github.com/USA-RedDragon/trunk-recorder/tree/main) until [this fix for SoapySDRPlay3](https://github.com/robotastic/trunk-recorder/pull/853) can be merged upstream, so upstream changes may be slightly delayed.

## Grafana Dashboard

A Grafana dashboard is available [here](https://grafana.com/grafana/dashboards/19959) and also in the `grafana/dashboard.json` file in this repository.
Expand Down
6 changes: 3 additions & 3 deletions grafana/dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@
}
]
},
"unit": "ms"
"unit": "µs"
},
"overrides": []
},
Expand Down Expand Up @@ -1104,7 +1104,7 @@
},
"disableTextWrap": false,
"editorMode": "code",
"expr": "exposer_request_latencies_sum{service=\"$service\"} / exposer_request_latencies_count{service=\"$service\"}",
"expr": "rate(exposer_request_latencies_sum{service=\"$service\"}[$__rate_interval]) / rate(exposer_request_latencies_count{service=\"$service\"}[$__rate_interval])",
"fullMetaSearch": false,
"hide": false,
"includeNullMetadata": true,
Expand Down Expand Up @@ -1200,6 +1200,6 @@
"timezone": "",
"title": "Trunk-recorder",
"uid": "f078861c-d709-4468-8195-4f21a421d2b3",
"version": 30,
"version": 32,
"weekStart": ""
}
Loading