Commit 096a8180 authored by tykling's avatar tykling
Browse files

do not aggregate by instance, set default to example servername

parent 01b45429
Loading
Loading
Loading
Loading
Loading
+36 −36
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@
            "h": 9,
            "w": 12,
            "x": 0,
            "y": 48
            "y": 62
          },
          "id": 105,
          "options": {
@@ -975,7 +975,7 @@
            "h": 9,
            "w": 12,
            "x": 12,
            "y": 48
            "y": 62
          },
          "id": 62,
          "options": {
@@ -1090,7 +1090,7 @@
            "h": 8,
            "w": 12,
            "x": 0,
            "y": 57
            "y": 71
          },
          "id": 65,
          "options": {
@@ -1204,7 +1204,7 @@
            "h": 8,
            "w": 12,
            "x": 12,
            "y": 57
            "y": 71
          },
          "id": 79,
          "options": {
@@ -1330,7 +1330,7 @@
            "h": 9,
            "w": 24,
            "x": 0,
            "y": 2308
            "y": 2905
          },
          "id": 22,
          "options": {
@@ -1407,7 +1407,7 @@
            "h": 10,
            "w": 5,
            "x": 0,
            "y": 2553
            "y": 3150
          },
          "id": 39,
          "options": {
@@ -1514,7 +1514,7 @@
            "h": 10,
            "w": 19,
            "x": 5,
            "y": 2553
            "y": 3150
          },
          "id": 19,
          "options": {
@@ -1636,7 +1636,7 @@
            "h": 10,
            "w": 24,
            "x": 0,
            "y": 66
            "y": 663
          },
          "id": 91,
          "options": {
@@ -1685,7 +1685,7 @@
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 83
        "y": 103
      },
      "id": 47,
      "panels": [
@@ -1715,7 +1715,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 5286
            "y": 7674
          },
          "id": 33,
          "maxPerRow": 2,
@@ -1824,7 +1824,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 5432
            "y": 7820
          },
          "id": 38,
          "options": {
@@ -1944,7 +1944,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 5437
            "y": 7825
          },
          "id": 84,
          "options": {
@@ -2069,7 +2069,7 @@
            "h": 6,
            "w": 24,
            "x": 0,
            "y": 5442
            "y": 7830
          },
          "id": 85,
          "options": {
@@ -2113,7 +2113,7 @@
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 87
        "y": 107
      },
      "id": 97,
      "panels": [
@@ -2187,7 +2187,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 12645
            "y": 32432
          },
          "id": 98,
          "options": {
@@ -2295,7 +2295,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 12710
            "y": 32497
          },
          "id": 100,
          "options": {
@@ -2403,7 +2403,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 12715
            "y": 32502
          },
          "id": 99,
          "options": {
@@ -2466,7 +2466,7 @@
            "h": 3,
            "w": 12,
            "x": 0,
            "y": 12720
            "y": 32507
          },
          "id": 8,
          "options": {
@@ -2591,7 +2591,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 12720
            "y": 32507
          },
          "id": 6,
          "options": {
@@ -2652,7 +2652,7 @@
            "h": 3,
            "w": 12,
            "x": 0,
            "y": 12723
            "y": 32510
          },
          "id": 21,
          "options": {
@@ -2723,7 +2723,7 @@
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 91
        "y": 111
      },
      "id": 49,
      "panels": [
@@ -2791,7 +2791,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 21295
            "y": 98960
          },
          "id": 40,
          "options": {
@@ -2924,7 +2924,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 21295
            "y": 98960
          },
          "id": 87,
          "options": {
@@ -3058,7 +3058,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 21301
            "y": 98966
          },
          "id": 89,
          "options": {
@@ -3193,7 +3193,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 21301
            "y": 98966
          },
          "id": 78,
          "options": {
@@ -3315,7 +3315,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 21307
            "y": 98972
          },
          "id": 45,
          "options": {
@@ -3437,7 +3437,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 21307
            "y": 98972
          },
          "id": 76,
          "options": {
@@ -3544,7 +3544,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 21313
            "y": 98978
          },
          "id": 44,
          "options": {
@@ -3661,7 +3661,7 @@
            "h": 6,
            "w": 8,
            "x": 12,
            "y": 21313
            "y": 98978
          },
          "id": 86,
          "options": {
@@ -3743,7 +3743,7 @@
            "h": 6,
            "w": 4,
            "x": 20,
            "y": 21313
            "y": 98978
          },
          "id": 88,
          "options": {
@@ -3851,7 +3851,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 21319
            "y": 98984
          },
          "id": 42,
          "options": {
@@ -3966,7 +3966,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 21319
            "y": 98984
          },
          "id": 77,
          "options": {
@@ -4038,7 +4038,9 @@
        "allValue": ".*",
        "current": {
          "text": "All",
          "value": "$__all"
          "value": [
            "$__all"
          ]
        },
        "datasource": {
          "type": "prometheus",
@@ -4064,9 +4066,7 @@
        "allValue": ".*",
        "allowCustomValue": false,
        "current": {
          "text": [
            "All"
          ],
          "text": "All",
          "value": [
            "$__all"
          ]
+37 −39
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@
      }
    ]
  },
  "description": "Metrics from the tor MetricsPort dashboard for getting an overview of 10s or 100s of relays",
  "description": "Metrics from the tor MetricsPort dashboard suitable for getting an overview of many (10s or 100s) of relays",
  "editable": true,
  "fiscalYearStartMonth": 0,
  "graphTooltip": 1,
@@ -702,7 +702,7 @@
            "h": 9,
            "w": 12,
            "x": 0,
            "y": 413
            "y": 45
          },
          "id": 105,
          "options": {
@@ -813,7 +813,7 @@
            "h": 9,
            "w": 12,
            "x": 12,
            "y": 413
            "y": 45
          },
          "id": 62,
          "options": {
@@ -928,7 +928,7 @@
            "h": 8,
            "w": 12,
            "x": 0,
            "y": 422
            "y": 71
          },
          "id": 65,
          "options": {
@@ -946,7 +946,7 @@
            "tooltip": {
              "hideZeros": false,
              "mode": "multi",
              "sort": "asc"
              "sort": "desc"
            }
          },
          "pluginVersion": "12.1.0",
@@ -1042,7 +1042,7 @@
            "h": 8,
            "w": 12,
            "x": 12,
            "y": 422
            "y": 71
          },
          "id": 79,
          "options": {
@@ -1060,7 +1060,7 @@
            "tooltip": {
              "hideZeros": false,
              "mode": "multi",
              "sort": "asc"
              "sort": "desc"
            }
          },
          "pluginVersion": "12.1.0",
@@ -1168,7 +1168,7 @@
            "h": 9,
            "w": 24,
            "x": 0,
            "y": 3399
            "y": 79
          },
          "id": 22,
          "options": {
@@ -1197,7 +1197,7 @@
                "uid": "df035ghdwogzkc"
              },
              "editorMode": "code",
              "expr": "sum(rate(tor_relay_exit_dns_error_total{instance=~\"$Relay\", reason=\"success\"}[$__rate_interval])) by (instance)",
              "expr": "sum(rate(tor_relay_exit_dns_error_total{instance=~\"$Relay\", reason=\"success\"}[$__rate_interval]))",
              "interval": "",
              "legendFormat": "{{ instance }} DNS Query Success/Sec",
              "range": true,
@@ -1209,7 +1209,7 @@
                "uid": "df035ghdwogzkc"
              },
              "editorMode": "code",
              "expr": "sum(rate(tor_relay_exit_dns_error_total{instance=~\"$Relay\", reason!=\"success\"}[$__rate_interval])) by (instance) * -1",
              "expr": "sum(rate(tor_relay_exit_dns_error_total{instance=~\"$Relay\", reason!=\"success\"}[$__rate_interval])) * -1",
              "hide": false,
              "interval": "",
              "legendFormat": "{{ instance }} DNS Query Errors/Sec",
@@ -1245,7 +1245,7 @@
            "h": 10,
            "w": 5,
            "x": 0,
            "y": 3644
            "y": 88
          },
          "id": 39,
          "options": {
@@ -1352,7 +1352,7 @@
            "h": 10,
            "w": 19,
            "x": 5,
            "y": 3644
            "y": 88
          },
          "id": 19,
          "options": {
@@ -1474,7 +1474,7 @@
            "h": 10,
            "w": 24,
            "x": 0,
            "y": 63
            "y": 3250
          },
          "id": 91,
          "options": {
@@ -1552,7 +1552,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 64
            "y": 219
          },
          "id": 33,
          "maxPerRow": 2,
@@ -1661,7 +1661,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 180
            "y": 224
          },
          "id": 38,
          "options": {
@@ -1781,7 +1781,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 185
            "y": 229
          },
          "id": 84,
          "options": {
@@ -1906,7 +1906,7 @@
            "h": 6,
            "w": 24,
            "x": 0,
            "y": 190
            "y": 234
          },
          "id": 85,
          "options": {
@@ -2023,7 +2023,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 65
            "y": 2043
          },
          "id": 98,
          "options": {
@@ -2131,7 +2131,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 100
            "y": 2078
          },
          "id": 100,
          "options": {
@@ -2239,7 +2239,7 @@
            "h": 5,
            "w": 24,
            "x": 0,
            "y": 105
            "y": 2083
          },
          "id": 99,
          "options": {
@@ -2302,7 +2302,7 @@
            "h": 3,
            "w": 12,
            "x": 0,
            "y": 110
            "y": 2088
          },
          "id": 8,
          "options": {
@@ -2427,7 +2427,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 110
            "y": 2088
          },
          "id": 6,
          "options": {
@@ -2488,7 +2488,7 @@
            "h": 3,
            "w": 12,
            "x": 0,
            "y": 113
            "y": 2091
          },
          "id": 21,
          "options": {
@@ -2626,7 +2626,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 66
            "y": 2044
          },
          "id": 40,
          "options": {
@@ -2747,7 +2747,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 66
            "y": 2044
          },
          "id": 87,
          "options": {
@@ -2881,7 +2881,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 72
            "y": 2050
          },
          "id": 89,
          "options": {
@@ -3016,7 +3016,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 72
            "y": 2050
          },
          "id": 78,
          "options": {
@@ -3138,7 +3138,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 78
            "y": 2056
          },
          "id": 45,
          "options": {
@@ -3260,7 +3260,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 78
            "y": 2056
          },
          "id": 76,
          "options": {
@@ -3367,7 +3367,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 84
            "y": 2062
          },
          "id": 44,
          "options": {
@@ -3484,7 +3484,7 @@
            "h": 6,
            "w": 8,
            "x": 12,
            "y": 84
            "y": 2062
          },
          "id": 86,
          "options": {
@@ -3569,7 +3569,7 @@
            "h": 6,
            "w": 4,
            "x": 20,
            "y": 84
            "y": 2062
          },
          "id": 88,
          "options": {
@@ -3677,7 +3677,7 @@
            "h": 6,
            "w": 12,
            "x": 0,
            "y": 90
            "y": 2068
          },
          "id": 42,
          "options": {
@@ -3792,7 +3792,7 @@
            "h": 6,
            "w": 12,
            "x": 12,
            "y": 90
            "y": 2068
          },
          "id": 77,
          "options": {
@@ -3862,9 +3862,7 @@
      {
        "allValue": ".*",
        "current": {
          "text": [
            "All"
          ],
          "text": "All",
          "value": [
            "$__all"
          ]
@@ -3934,5 +3932,5 @@
  "timezone": "",
  "title": "Tor Relay (many relays)",
  "uid": "lSlMY1v4zv5",
  "version": 8
  "version": 13
}
 No newline at end of file
+3 −3
Original line number Diff line number Diff line
@@ -4021,8 +4021,8 @@
    "list": [
      {
        "current": {
          "text": "tor01.zencurity.com:9035",
          "value": "tor01.zencurity.com:9035"
          "text": "relay1.example.com:9035",
          "value": "relay1.example.com:9035"
        },
        "datasource": {
          "type": "prometheus",