some small adjustments

raylas · Nov 28, 2022 · 2f4b11a · 2f4b11a
1 parent c00b972
commit 2f4b11a
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 33 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -29,6 +29,10 @@ jobs:
 
     - name: Run tests
       run: go test -v ./...
+      env:
+        # False values to satisfy environment checks.
+        NEXTDNS_PROFILE: bhu7e3
+        NEXTDNS_API_KEY: 1234567890abcdef
 
   release:
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')

diff --git a/grafana/dashboards/nextdns.json b/grafana/dashboards/nextdns.json
@@ -112,7 +112,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "nextdns_queries_total",
+          "expr": "nextdns_queries_total{profile=\"$profile\"}",
           "legendFormat": "All",
           "range": true,
           "refId": "all"
@@ -176,8 +176,8 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "builder",
-          "expr": "nextdns_blocked_queries",
+          "editorMode": "code",
+          "expr": "nextdns_blocked_queries{profile=\"$profile\"}",
           "legendFormat": "{{domain}}",
           "range": true,
           "refId": "domains"
@@ -240,8 +240,8 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "builder",
-          "expr": "nextdns_device_queries",
+          "editorMode": "code",
+          "expr": "nextdns_device_queries{profile=\"$profile\"}",
           "legendFormat": "{{name}}",
           "range": true,
           "refId": "devices"
@@ -306,7 +306,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(increase(nextdns_blocked_queries_total[$__range]))",
+          "expr": "sum(increase(nextdns_blocked_queries_total{profile=\"$profile\"}[$__range]))",
           "hide": true,
           "legendFormat": "Blocked",
           "range": true,
@@ -318,7 +318,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(increase(nextdns_queries_total[$__range]))",
+          "expr": "sum(increase(nextdns_queries_total{profile=\"$profile\"}[$__range]))",
           "hide": true,
           "legendFormat": "Total",
           "range": true,
@@ -419,7 +419,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(increase(nextdns_queries_total[$__range]))",
+          "expr": "sum(increase(nextdns_queries_total{profile=\"$profile\"}[$__range]))",
           "hide": false,
           "legendFormat": "Total",
           "range": true,
@@ -511,8 +511,8 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "builder",
-          "expr": "nextdns_type_queries",
+          "editorMode": "code",
+          "expr": "nextdns_type_queries{profile=\"$profile\"}",
           "legendFormat": "{{name}}",
           "range": true,
           "refId": "types"
@@ -605,7 +605,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "nextdns_blocked_queries_total",
+          "expr": "nextdns_blocked_queries_total{profile=\"$profile\"}",
           "legendFormat": "Blocked",
           "range": true,
           "refId": "blocked"
@@ -697,7 +697,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "nextdns_ip_version_queries",
+          "expr": "nextdns_ip_version_queries{profile=\"$profile\"}",
           "legendFormat": "IPv{{version}}",
           "range": true,
           "refId": "ip_versions"
@@ -720,6 +720,10 @@
           "text": "e6e9b2",
           "value": "e6e9b2"
         },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PBFA97CFB590B2093"
+        },
         "definition": "label_values(profile)",
         "hide": 0,
         "includeAll": false,
@@ -739,7 +743,7 @@
     ]
   },
   "time": {
-    "from": "now-30m",
+    "from": "now-15m",
     "to": "now"
   },
   "timepicker": {},

diff --git a/internal/util/config.go b/internal/util/config.go
@@ -2,7 +2,7 @@ package util
 
 import (
 	"fmt"
-	"runtime/debug"
+	"os"
 
 	"github.com/hashicorp/go-hclog"
 )
@@ -12,6 +12,8 @@ const (
 	BaseURL   = "https://api.nextdns.io"
 )
 
+var version = "dev" // Set by goreleaser.
+
 var (
 	Log          hclog.Logger
 	Version      string
@@ -26,23 +28,30 @@ var (
 // Initialize the configuration.
 func init() {
 	// Set up logging.
-	level := GetEnv("LOG_LEVEL", "INFO")
+	level := DefaultEnv("LOG_LEVEL", "INFO")
 	Log = hclog.New(&hclog.LoggerOptions{
 		Level: hclog.LevelFromString(level),
 	})
 
-	// Retrieve version.
-	if info, ok := debug.ReadBuildInfo(); ok && info.Main.Sum != "" {
-		Version = info.Main.Version
-	} else {
-		Version = "dev"
-	}
+	// Set version.
+	Version = version
+
+	// Retrieve configuration, or use defaults.
+	Port = fmt.Sprintf(":%s", DefaultEnv("METRICS_PORT", "9948"))
+	MetricsPath = DefaultEnv("METRICS_PATH", "/metrics")
+	ResultWindow = DefaultEnv("NEXTDNS_RESULT_WINDOW", "-5m")
+	ResultLimit = DefaultEnv("NEXTDNS_RESULT_LIMIT", "50")
 
-	// Set up exporter.
-	Port = fmt.Sprintf(":%s", GetEnv("METRICS_PORT", "9948"))
-	MetricsPath = GetEnv("METRICS_PATH", "/metrics")
-	Profile = GetEnv("NEXTDNS_PROFILE", "")
-	APIKey = GetEnv("NEXTDNS_API_KEY", "")
-	ResultWindow = GetEnv("NEXTDNS_RESULT_WINDOW", "-5m")
-	ResultLimit = GetEnv("NEXTDNS_RESULT_LIMIT", "50")
+	// Required configuration.
+	var set bool
+	Profile, set = os.LookupEnv("NEXTDNS_PROFILE")
+	if !set {
+		Log.Error("NEXTDNS_PROFILE must be set")
+		os.Exit(1)
+	}
+	APIKey, set = os.LookupEnv("NEXTDNS_API_KEY")
+	if !set {
+		Log.Error("NEXTDNS_API_KEY must be set")
+		os.Exit(1)
+	}
 }
diff --git a/internal/util/util.go b/internal/util/util.go
@@ -4,8 +4,9 @@ import (
 	"os"
 )
 
-// Return the value of an environment variable, or a default value if it is not set.
-func GetEnv(key, usual string) string {
+// Return the value of an environment variable,
+// or a default value if it is not set.
+func DefaultEnv(key, usual string) string {
 	value := os.Getenv(key)
 	if len(value) == 0 {
 		return usual

diff --git a/internal/util/util_test.go b/internal/util/util_test.go
@@ -5,13 +5,13 @@ import (
 	"testing"
 )
 
-func TestGetEnv(t *testing.T) {
+func TestDefaultEnv(t *testing.T) {
 	os.Setenv("FOO", "bar")
 
-	if GetEnv("FOO", "baz") != "bar" {
+	if DefaultEnv("FOO", "baz") != "bar" {
 		t.Error("expected to get `bar`")
 	}
-	if GetEnv("BAR", "baz") != "baz" {
+	if DefaultEnv("BAR", "baz") != "baz" {
 		t.Error("expected to get `baz`")
 	}
 }