added downtime stats

cyclic/statisticsHost.go

@@ -41,9 +41,12 @@ func (s HostStatistics) run() {
 				hostStates.StateTypeToString(hostStates.Down):        0,
 				hostStates.StateTypeToString(hostStates.Unreachable): 0,
 			}, hostStates.StateTypeToString)
-			flapping, enabled := countMinorStats(meta)
-			prom.StatsHostsFlapping.Set(flapping)
-			prom.StatsHostsChecksEnabled.Set(enabled)
+			countMinorStats(meta,
+				prom.StatsHostsFlapping,
+				prom.StatsHostsChecksEnabled,
+				prom.StatsHostsFlexDowntime,
+				prom.StatsHostsDowntime,
+			)
 		}
 	}
 }

cyclic/statisticsMetaHostAndServiceList.go

@@ -44,14 +44,24 @@ func countTypes(meta structs.MetaHostAndServiceList, target *prometheus.GaugeVec
 	}
 }
 
-func countMinorStats(meta structs.MetaHostAndServiceList) (flapping, enabled float64) {
-	for _, h := range meta {
-		if h.IsFlapping > 0 {
+func countMinorStats(meta structs.MetaHostAndServiceList, gFlapping, gEnabled, gFlexDowntime, gDowntime prometheus.Gauge) {
+	flapping, enabled, flexDowntime, downtime := 0.0, 0.0, 0.0, 0.0
+	for _, m := range meta {
+		if m.IsFlapping > 0 {
 			flapping++
 		}
-		if h.ChecksEnabled > 0 {
+		if m.ChecksEnabled > 0 {
 			enabled++
 		}
+		if m.PendingFlexDowntimeDepth > 0 {
+			flexDowntime++
+		}
+		if m.ScheduledDowntimeDepth > 0 {
+			downtime++
+		}
 	}
-	return
+	gFlapping.Set(flapping)
+	gEnabled.Set(enabled)
+	gFlexDowntime.Set(flexDowntime)
+	gDowntime.Set(downtime)
 }

cyclic/statisticsService.go

@@ -42,9 +42,13 @@ func (s ServiceStatistics) run() {
 				serviceStates.ServiceStatesToString(serviceStates.Critical): 0,
 				serviceStates.ServiceStatesToString(serviceStates.Unknown):  0,
 			}, serviceStates.ServiceStatesToString)
-			flapping, enabled := countMinorStats(meta)
-			prom.StatsServicesFlapping.Set(flapping)
-			prom.StatsServicesChecksEnabled.Set(enabled)
+			countMinorStats(meta,
+				prom.StatsServicesFlapping,
+				prom.StatsServicesChecksEnabled,
+				prom.StatsServicesFlexDowntime,
+				prom.StatsServicesDowntime,
+			)
+
 		}
 	}
 }

prom/statisticsHost.go

@@ -50,6 +50,26 @@ var StatsHostsFlapping = prometheus.NewGauge(
 	},
 )
 
+//StatsHostsFlexDowntime is a Prometheus gauge
+var StatsHostsFlexDowntime = prometheus.NewGauge(
+	prometheus.GaugeOpts{
+		Namespace: namespaceCore,
+		Subsystem: subsystemStatisticsHosts,
+		Name:      "downtime_flex_total",
+		Help:      "Amount of Hosts currently with a flex downtime",
+	},
+)
+
+//StatsHostsDowntime is a Prometheus gauge
+var StatsHostsDowntime = prometheus.NewGauge(
+	prometheus.GaugeOpts{
+		Namespace: namespaceCore,
+		Subsystem: subsystemStatisticsHosts,
+		Name:      "downtime_total",
+		Help:      "Amount of Hosts currently with a downtime",
+	},
+)
+
 //StatsHostsChecksEnabled is a Prometheus gauge
 var StatsHostsChecksEnabled = prometheus.NewGauge(
 	prometheus.GaugeOpts{
@@ -65,5 +85,7 @@ func initStatisticsHost() {
 	prometheus.MustRegister(StatsHostsCheckType)
 	prometheus.MustRegister(StatsHostsStateType)
 	prometheus.MustRegister(StatsHostsFlapping)
+	prometheus.MustRegister(StatsHostsFlexDowntime)
+	prometheus.MustRegister(StatsHostsDowntime)
 	prometheus.MustRegister(StatsHostsChecksEnabled)
 }

prom/statisticsService.go

@@ -48,6 +48,26 @@ var StatsServicesFlapping = prometheus.NewGauge(
 	},
 )
 
+//StatsServicesFlexDowntime is a Prometheus gauge
+var StatsServicesFlexDowntime = prometheus.NewGauge(
+	prometheus.GaugeOpts{
+		Namespace: namespaceCore,
+		Subsystem: subsystemStatisticsServices,
+		Name:      "downtime_flex_total",
+		Help:      "Amount of Services currently with a flex downtime",
+	},
+)
+
+//StatsServicesDowntime is a Prometheus gauge
+var StatsServicesDowntime = prometheus.NewGauge(
+	prometheus.GaugeOpts{
+		Namespace: namespaceCore,
+		Subsystem: subsystemStatisticsServices,
+		Name:      "downtime_total",
+		Help:      "Amount of Services currently with a downtime",
+	},
+)
+
 //StatsServicesChecksEnabled is a Prometheus gauge
 var StatsServicesChecksEnabled = prometheus.NewGauge(
 	prometheus.GaugeOpts{
@@ -63,5 +83,7 @@ func initStatisticsService() {
 	prometheus.MustRegister(StatsServicesCheckType)
 	prometheus.MustRegister(StatsServicesStateType)
 	prometheus.MustRegister(StatsServicesFlapping)
+	prometheus.MustRegister(StatsServicesFlexDowntime)
+	prometheus.MustRegister(StatsServicesDowntime)
 	prometheus.MustRegister(StatsServicesChecksEnabled)
 }