From 43924262928a8f517fe2f30db90a23234a2eb1c4 Mon Sep 17 00:00:00 2001
From: Michael Walker <mike@barrucadu.co.uk>
Date: Sun, 24 Sep 2023 00:23:12 +0100
Subject: [PATCH] Bump resolved & add "refused" to dashboard

This new version fixes NXDOMAIN / NODATA responses (previously most such
instances would instead return ServFail), and adds a metric for why
queries have been refused.
---
 packages/resolved/default.nix  |   6 +-
 shared/resolved/dashboard.json | 108 +++++++++++++++++++++++++++++++--
 2 files changed, 106 insertions(+), 8 deletions(-)

diff --git a/packages/resolved/default.nix b/packages/resolved/default.nix
index 098ac809..2e2a9296 100644
--- a/packages/resolved/default.nix
+++ b/packages/resolved/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "resolved";
-  version = "47da2a112e07bee239c7d2d54a7184946980d3bd";
+  version = "32c92d919a440c53f8a127d4e04ce848284260e5";
 
   src = fetchFromGitHub {
     owner = "barrucadu";
     repo = pname;
     rev = version;
-    sha256 = "sha256-aCkhSUHS268cXFdw/YMjZkV0LbPrAq0MpQ+P25M6z6I=";
+    sha256 = "sha256-L1ix6/w7G9McBBio2Q9AG9KB/C0Sfc4goZFmYvPDVT0=";
   };
 
-  cargoSha256 = "sha256-Y+XKddzHY2Uk68Oeb4vSPULAnbiVV7ed/Obm8ki3dxQ=";
+  cargoSha256 = "sha256-D/sqG3PnCS0ormV+PgZLk/p6fSOyhcCNaHV3qRXDh5Q=";
 
   postInstall = ''
     cd config
diff --git a/shared/resolved/dashboard.json b/shared/resolved/dashboard.json
index f618f99d..65bedf06 100644
--- a/shared/resolved/dashboard.json
+++ b/shared/resolved/dashboard.json
@@ -475,10 +475,108 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 8,
+        "w": 6,
         "x": 0,
         "y": 8
       },
+      "id": 27,
+      "options": {
+        "legend": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "P1809F7CD0C75ACF3"
+          },
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "sum(dns_requests_refused_total{job=\"$Job\"}) by(reason)",
+          "interval": "",
+          "legendFormat": "{{reason}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Refused",
+      "transparent": true,
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "P1809F7CD0C75ACF3"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMin": 0,
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 6,
+        "y": 8
+      },
       "id": 13,
       "options": {
         "legend": {
@@ -571,8 +669,8 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 8,
-        "x": 8,
+        "w": 6,
+        "x": 12,
         "y": 8
       },
       "id": 17,
@@ -724,8 +822,8 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 8,
-        "x": 16,
+        "w": 6,
+        "x": 18,
         "y": 8
       },
       "id": 18,