Add TrackerDomain, DownloadTotals and UploadTotals to metrics

README.md

@@ -35,6 +35,6 @@ Sample
 ------
 
 Here is a screenshot of a sample dashboard created using [`grafana`](https://github.com/grafana/grafana)
-with metrics from exported from `rtorrent_exporter`.
+with metrics from exported from `rtorrent_exporter` (see sample_dash.json).
 
-![sample](https://cloud.githubusercontent.com/assets/1926905/13891308/bad263be-ed26-11e5-9601-9d770d95c538.png)
+![sample](https://user-images.githubusercontent.com/766820/29206006-923e7b20-7e45-11e7-84ae-1e51d0755f92.jpg)

cmd/rtorrent_exporter/main.go

@@ -48,7 +48,7 @@ func main() {
 		http.Redirect(w, r, *metricsPath, http.StatusMovedPermanently)
 	})
 
-	log.Printf("starting rTorrent exporter on %q for server %q (authentication: %v)",
+	log.Printf("starting rTorrent v0.1.1 exporter on %q for server %q (authentication: %v)",
 		*telemetryAddr, *rtorrentAddr, rt != nil)
 
 	if err := http.ListenAndServe(*telemetryAddr, nil); err != nil {

downloadscollector.go

@@ -23,8 +23,12 @@ type DownloadsSource interface {
 	Active() ([]string, error)
 
 	BaseFilename(infoHash string) (string, error)
+	TrackerDomain(infoHash string) (string, error)
 	DownloadRate(infoHash string) (int, error)
 	UploadRate(infoHash string) (int, error)
+
+	DownloadTotal(infoHash string) (int, error)
+	UploadTotal(infoHash string) (int, error)
 }
 
 // A DownloadsCollector is a Prometheus collector for metrics regarding rTorrent
@@ -43,6 +47,9 @@ type DownloadsCollector struct {
 	DownloadRateBytes *prometheus.Desc
 	UploadRateBytes   *prometheus.Desc
 
+	DownloadTotalBytes *prometheus.Desc
+	UploadTotalBytes   *prometheus.Desc
+
 	ds DownloadsSource
 }
 
@@ -57,7 +64,7 @@ func NewDownloadsCollector(ds DownloadsSource) *DownloadsCollector {
 	)
 
 	var (
-		labels = []string{"info_hash", "name"}
+		labels = []string{"info_hash", "name", "tracker"}
 	)
 
 	return &DownloadsCollector{
@@ -139,6 +146,20 @@ func NewDownloadsCollector(ds DownloadsSource) *DownloadsCollector {
 			nil,
 		),
 
+		DownloadTotalBytes: prometheus.NewDesc(
+			prometheus.BuildFQName(namespace, subsystem, "download_total_bytes"),
+			"Current download total in bytes.",
+			labels,
+			nil,
+		),
+
+		UploadTotalBytes: prometheus.NewDesc(
+			prometheus.BuildFQName(namespace, subsystem, "upload_total_bytes"),
+			"Current upload total in bytes.",
+			labels,
+			nil,
+		),
+
 		ds: ds,
 	}
 }
@@ -154,6 +175,10 @@ func (c *DownloadsCollector) collect(ch chan<- prometheus.Metric) (*prometheus.D
 		return desc, err
 	}
 
+	if desc, err := c.collectAllDownloads(ch); err != nil {
+		return desc, err
+	}
+
 	return nil, nil
 }
 
@@ -271,9 +296,15 @@ func (c *DownloadsCollector) collectActiveDownloads(ch chan<- prometheus.Metric)
 			return c.DownloadRateBytes, err
 		}
 
+		tracker, err := c.ds.TrackerDomain(a)
+		if err != nil {
+			return c.DownloadRateBytes, err
+		}
+
 		labels := []string{
 			a,
 			name,
+			tracker,
 		}
 
 		down, err := c.ds.DownloadRate(a)
@@ -304,6 +335,58 @@ func (c *DownloadsCollector) collectActiveDownloads(ch chan<- prometheus.Metric)
 	return nil, nil
 }
 
+// collectAllDownloads collects information about all downloads
+func (c *DownloadsCollector) collectAllDownloads(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	all, err := c.ds.All()
+	if err != nil {
+		return c.Downloads, err
+	}
+
+	for _, a := range all {
+		name, err := c.ds.BaseFilename(a)
+		if err != nil {
+			return c.DownloadTotalBytes, err
+		}
+
+		tracker, err := c.ds.TrackerDomain(a)
+		if err != nil {
+			return c.DownloadTotalBytes, err
+		}
+
+		labels := []string{
+			a,
+			name,
+			tracker,
+		}
+
+		down, err := c.ds.DownloadTotal(a)
+		if err != nil {
+			return c.DownloadTotalBytes, err
+		}
+
+		up, err := c.ds.UploadTotal(a)
+		if err != nil {
+			return c.UploadTotalBytes, err
+		}
+
+		ch <- prometheus.MustNewConstMetric(
+			c.DownloadTotalBytes,
+			prometheus.CounterValue,
+			float64(down),
+			labels...,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.UploadTotalBytes,
+			prometheus.CounterValue,
+			float64(up),
+			labels...,
+		)
+	}
+
+	return nil, nil
+}
+
 // Describe sends the descriptors of each metric over to the provided channel.
 // The corresponding metric values are sent separately.
 func (c *DownloadsCollector) Describe(ch chan<- *prometheus.Desc) {
@@ -320,6 +403,9 @@ func (c *DownloadsCollector) Describe(ch chan<- *prometheus.Desc) {
 
 		c.DownloadRateBytes,
 		c.UploadRateBytes,
+
+		c.DownloadTotalBytes,
+		c.UploadTotalBytes,
 	}
 
 	for _, d := range ds {