PMM-1901 metrics endpoint and collectors filtering.

README.md

@@ -52,20 +52,46 @@ scrape_configs:
   - job_name: rds-basic
     scrape_interval: 60s
     scrape_timeout: 55s
-    metrics_path: /basic
     honor_labels: true
     static_configs:
       - targets:
         - 127.0.0.1:9042
+    params:
+        collect[]:
+          - basic
 
   - job_name: rds-enhanced
     scrape_interval: 10s
     scrape_timeout: 9s
-    metrics_path: /enhanced
     honor_labels: true
     static_configs:
       - targets:
         - 127.0.0.1:9042
+    params:
+        collect[]:
+          - enhanced
 ```
 
 `honor_labels: true` is important because exporter returns metrics with `instance` label set.
+
+## Collectors
+
+### Enabled by default
+
+Name     | Description 
+---------|-------------
+basic | Basic metrics from https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/MonitoringOverview.html#monitoring-cloudwatch.
+enhanced | Enhanced metrics from https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html.
+
+### Filtering enabled collectors
+
+The `rds_exporter` will expose all metrics from enabled collectors by default.
+
+For advanced use the `rds_exporter` can be passed an optional list of collectors to filter metrics. The `collect[]` parameter may be used multiple times.  In Prometheus configuration you can use this syntax under the [scrape config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#<scrape_config>).
+
+```
+  params:
+    collect[]:
+      - basic
+      - enhanced
+```

basic/basic.go

@@ -11,8 +11,6 @@ import (
 	"github.com/percona/rds_exporter/sessions"
 )
 
-//go:generate go run generate/main.go generate/utils.go
-
 var (
 	scrapeTimeDesc = prometheus.NewDesc(
 		"rds_exporter_scrape_duration_seconds",
@@ -44,6 +42,27 @@ func New(config *config.Config, sessions *sessions.Sessions) *Exporter {
 	}
 }
 
+// ExcludeMetrics exclude some metrics from collector.
+// This need for resolve metric names conflicts when registering basic and enhanced collectors.
+func (e *Exporter) ExcludeMetrics(metrics ...string) {
+	var filtered []Metric
+	for _, v := range e.metrics {
+		if !contains(v.Name, metrics) {
+			filtered = append(filtered, v)
+		}
+	}
+	e.metrics = filtered
+}
+
+func contains(metricName string, metrics []string) bool {
+	for _, v := range metrics {
+		if v == metricName {
+			return true
+		}
+	}
+	return false
+}
+
 func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
 	now := time.Now()
 	e.collect(ch)

basic/metrics.go

@@ -1,4 +1,3 @@
-// Code generated by go generate; DO NOT EDIT.
 package basic
 
 import (