cmd/tclipd/main.go

@@ -75,7 +75,7 @@ var (
 	pasteViews = promauto.NewCounterVec(prometheus.CounterOpts{
 		Name: "tclip_paste_views",
 		Help: "Number of times a paste has been viewed",
-	}, []string{"id", "origin", "type"})
+	}, []string{"id", "origin"})
 )
 
 func dataLocation() string {
@@ -590,7 +590,7 @@ WHERE p.id = $1`
 			w.WriteHeader(http.StatusOK)
 			fmt.Fprint(w, data)
 
-			pasteViews.With(prometheus.Labels{"id": id, "origin": origin, "type": "raw"}).Inc()
+			pasteViews.With(prometheus.Labels{"id": id, "origin": origin}).Inc()
 
 			return
 		// download file to disk (plain text view plus download hint)
@@ -601,7 +601,7 @@ WHERE p.id = $1`
 
 			w.WriteHeader(http.StatusOK)
 			fmt.Fprint(w, data)
-			pasteViews.With(prometheus.Labels{"id": id, "origin": origin, "type": "download"}).Inc()
+			pasteViews.With(prometheus.Labels{"id": id, "origin": origin}).Inc()
 
 			return
 		case "":
@@ -625,7 +625,7 @@ WHERE p.id = $1`
 					title = ogTitle
 				}
 			}
-			pasteViews.With(prometheus.Labels{"id": id, "origin": origin, "type": "fancy"}).Inc()
+			pasteViews.With(prometheus.Labels{"id": id, "origin": origin}).Inc()
 
 			err = s.tmpls.ExecuteTemplate(w, "fancypost.html", struct {
 				Title               string
@@ -658,7 +658,7 @@ WHERE p.id = $1`
 		remoteUserID = up.ID
 	}
 
-	pasteViews.With(prometheus.Labels{"id": id, "origin": origin, "type": "normal"}).Inc()
+	pasteViews.With(prometheus.Labels{"id": id, "origin": origin}).Inc()
 
 	err = s.tmpls.ExecuteTemplate(w, "showpaste.html", struct {
 		UserInfo            *tailcfg.UserProfile

contrib/grafana.json

@@ -164,7 +164,7 @@
             "axisPlacement": "auto",
             "barAlignment": 0,
             "drawStyle": "line",
-            "fillOpacity": 0,
+            "fillOpacity": 5,
             "gradientMode": "none",
             "hideFrom": {
               "legend": false,
@@ -229,9 +229,9 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum(tclip_paste_views{origin=~\"$origin\"}) by (id, type)",
+          "expr": "sum(tclip_paste_views{origin=~\"$origin\"}) by (id)",
           "instant": false,
-          "legendFormat": "{{id}} ({{type}})",
+          "legendFormat": "{{id}}",
           "range": true,
           "refId": "A"
         }
@@ -1284,6 +1284,10 @@
       {
         "allValue": ".*",
         "current": {},
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${DS_PROMETHEUS}"
+        },
         "definition": "label_values(tclip_paste_views,origin)",
         "hide": 0,
         "includeAll": true,
@@ -1331,6 +1335,6 @@
   "timezone": "browser",
   "title": "tclip",
   "uid": "ypFZFgvmz",
-  "version": 16,
+  "version": 17,
   "weekStart": ""
 }