etcd-backup-operator: add prometheus-metrics.

Added a few metricts and an exporter to the backup operator.

Related to: #2095

Removed gorilla mux

Author: jescarri

Gopkg.lock

@@ -17,15 +17,12 @@ package main
 import (
 	"context"
 	"flag"
-	"os"
-	"runtime"
-	"time"
-
+	"fmt"
 	controller "github.com/coreos/etcd-operator/pkg/controller/backup-operator"
 	"github.com/coreos/etcd-operator/pkg/util/constants"
 	"github.com/coreos/etcd-operator/pkg/util/k8sutil"
 	version "github.com/coreos/etcd-operator/version"
-
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
@@ -34,6 +31,10 @@ import (
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/client-go/tools/record"
+	"net/http"
+	"os"
+	"runtime"
+	"time"
 )
 
 var (
@@ -81,7 +82,8 @@ func main() {
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-
+	http.Handle("/metrics", promhttp.Handler())
+	go http.ListenAndServe(fmt.Sprintf(":%d", 9091), router)
 	leaderelection.RunOrDie(ctx, leaderelection.LeaderElectionConfig{
 		Lock:          rl,
 		LeaseDuration: 15 * time.Second,

cmd/backup-operator/main.go

@@ -0,0 +1,35 @@
+package metrics
+
+import "github.com/prometheus/client_golang/prometheus"
+
+var (
+	BackupsAttemptedTotal = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "etcd_operator",
+		Name:      "backups_attempt_total",
+		Help:      "Backups attempt by name and namespace",
+	},
+		[]string{"name", "namespace"},
+	)
+
+	BackupsSuccessTotal = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "etcd_operator",
+		Name:      "backups_success_total",
+		Help:      "Backups success by name and namespace",
+	},
+		[]string{"name", "namespace"},
+	)
+
+	BackupsLastSuccess = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace: "etcd_operator",
+		Name:      "backup_last_success",
+		Help:      "Timestamp of last successfull backup, by name and namespace",
+	},
+		[]string{"name", "namespace"},
+	)
+)
+
+func init() {
+	prometheus.MustRegister(BackupsAttemptedTotal)
+	prometheus.MustRegister(BackupsSuccessTotal)
+	prometheus.MustRegister(BackupsLastSuccess)
+}

pkg/backup/metrics/metrics.go

@@ -21,8 +21,9 @@ import (
 	"time"
 
 	api "github.com/coreos/etcd-operator/pkg/apis/etcd/v1beta2"
+	"github.com/coreos/etcd-operator/pkg/backup/metrics"
 	"github.com/coreos/etcd-operator/pkg/util/constants"
-
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -101,14 +102,17 @@ func (b *Backup) processItem(key string) error {
 		ctx := context.Background()
 		ctx, cancel := context.WithCancel(ctx)
 		go b.periodicRunnerFunc(ctx, ticker, eb)
-
 		// Store cancel function for periodic
 		b.backupRunnerStore.Store(eb.ObjectMeta.UID, BackupRunner{eb.Spec, cancel})
 
 	} else if !isPeriodic {
 		// Perform backup
+		metrics.BackupsAttemptedTotal.With(prometheus.Labels(prometheus.Labels{
+			"namespace": eb.ObjectMeta.Namespace,
+			"name":      eb.ObjectMeta.Name,
+		})).Inc()
 		bs, err := b.handleBackup(nil, &eb.Spec, false)
-		// Report backup status
+		//status of backup
 		b.reportBackupStatus(bs, err, eb)
 	}
 	return err
@@ -195,9 +199,13 @@ func (b *Backup) periodicRunnerFunc(ctx context.Context, t *time.Ticker, eb *api
 			}
 			if err == nil {
 				// Perform backup
+				metrics.BackupsAttemptedTotal.With(prometheus.Labels(prometheus.Labels{
+					"namespace": eb.ObjectMeta.Namespace,
+					"name":      eb.ObjectMeta.Name,
+				})).Inc()
 				bs, err = b.handleBackup(&ctx, &latestEb.Spec, true)
 			}
-			// Report backup status
+			//BackupStatus here
 			b.reportBackupStatus(bs, err, latestEb)
 		}
 	}
@@ -213,6 +221,15 @@ func (b *Backup) reportBackupStatus(bs *api.BackupStatus, berr error, eb *api.Et
 		eb.Status.EtcdRevision = bs.EtcdRevision
 		eb.Status.EtcdVersion = bs.EtcdVersion
 		eb.Status.LastSuccessDate = bs.LastSuccessDate
+		metrics.BackupsSuccessTotal.With(prometheus.Labels(prometheus.Labels{
+			"namespace": eb.ObjectMeta.Namespace,
+			"name":      eb.ObjectMeta.Name,
+		})).Inc()
+		metrics.BackupsLastSuccess.With(prometheus.Labels(prometheus.Labels{
+			"namespace": eb.ObjectMeta.Namespace,
+			"name":      eb.ObjectMeta.Name,
+		})).Set(float64(time.Now().Unix()))
+
 	}
 	_, err := b.backupCRCli.EtcdV1beta2().EtcdBackups(b.namespace).Update(eb)
 	if err != nil {
@@ -249,7 +266,6 @@ func (b *Backup) handleBackup(parentContext *context.Context, spec *api.BackupSp
 	if err != nil {
 		return nil, err
 	}
-
 	// When BackupPolicy.TimeoutInSecond <= 0, use default DefaultBackupTimeout.
 	backupTimeout := time.Duration(constants.DefaultBackupTimeout)
 	if spec.BackupPolicy != nil && spec.BackupPolicy.TimeoutInSecond > 0 {