From 2cfcb0881ed2d8755615500fc2520bc5754cf261 Mon Sep 17 00:00:00 2001
From: Jacob McSwain <jacob.a.mcswain@gmail.com>
Date: Sat, 11 Nov 2023 04:52:16 -0600
Subject: [PATCH 1/4] Dockerfile: Swap back to upstream

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 205fb0a..c7c8c7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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:4.6.0@sha256:916d40611a1310a53159ede0e34c1dde0b907c9306aea07d5aa875eda9b983e6
 
 COPY --from=prometheus-cpp-builder /prometheus-cpp.deb /tmp/prometheus-cpp.deb
 RUN apt update && export DEBIAN_FRONTEND=noninteractive && \

From 3b380d2adeeb5164b5b8dd7daa54940b1ebf5434 Mon Sep 17 00:00:00 2001
From: Jacob McSwain <jacob.a.mcswain@gmail.com>
Date: Sat, 11 Nov 2023 04:56:53 -0600
Subject: [PATCH 2/4] README: remove fork note

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 6ed2d88..2bc3c53 100644
--- a/README.md
+++ b/README.md
@@ -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.

From 37cbdd94377cefafee3726e24a246ef07611a253 Mon Sep 17 00:00:00 2001
From: Jacob McSwain <jacob.a.mcswain@gmail.com>
Date: Sat, 11 Nov 2023 17:46:20 -0600
Subject: [PATCH 3/4] Dashboard: Fix time unit for request latencies, and add
 proper average

---
 grafana/dashboard.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grafana/dashboard.json b/grafana/dashboard.json
index f8ba60a..e02ffe3 100644
--- a/grafana/dashboard.json
+++ b/grafana/dashboard.json
@@ -1057,7 +1057,7 @@
               }
             ]
           },
-          "unit": "ms"
+          "unit": "µs"
         },
         "overrides": []
       },
@@ -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,
@@ -1200,6 +1200,6 @@
   "timezone": "",
   "title": "Trunk-recorder",
   "uid": "f078861c-d709-4468-8195-4f21a421d2b3",
-  "version": 30,
+  "version": 32,
   "weekStart": ""
 }
\ No newline at end of file

From 2c42d28d36c34fca070e49e9494b2bfee9c5ae75 Mon Sep 17 00:00:00 2001
From: Jacob McSwain <jacob.a.mcswain@gmail.com>
Date: Sat, 11 Nov 2023 17:50:07 -0600
Subject: [PATCH 4/4] Docker: use upstream `edge` tag

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c7c8c7a..d402020 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN git clone https://github.com/jupp0r/prometheus-cpp -b ${PROMETHEUS_CPP_VERSI
     cd - && \
     rm -rf /tmp/prometheus-cpp
 
-FROM robotastic/trunk-recorder:4.6.0@sha256:916d40611a1310a53159ede0e34c1dde0b907c9306aea07d5aa875eda9b983e6
+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 && \