From 229843ad7a4b68bfa21068e990db14844e92c8f6 Mon Sep 17 00:00:00 2001
From: Oliver Herms <oliver.herms@exaring.de>
Date: Fri, 28 Aug 2020 16:11:47 +0200
Subject: [PATCH] Moving stuff around
---
cmd/ris-mirror/rismirror/rismirror.go | 2 +-
.../adapter/prom/ris_mirror_prom_adapter.go | 28 +-----------
protocols/ris/metrics/ris_mirror_metrics.go | 43 -------------------
3 files changed, 2 insertions(+), 71 deletions(-)
delete mode 100644 protocols/ris/metrics/ris_mirror_metrics.go
diff --git a/cmd/ris-mirror/rismirror/rismirror.go b/cmd/ris-mirror/rismirror/rismirror.go
index 9da635da..897b8e07 100644
--- a/cmd/ris-mirror/rismirror/rismirror.go
+++ b/cmd/ris-mirror/rismirror/rismirror.go
@@ -4,8 +4,8 @@ import (
"net"
"sync"
+ "github.com/bio-routing/bio-rd/cmd/ris-mirror/rismirror/metrics"
"github.com/bio-routing/bio-rd/protocols/bgp/server"
- "github.com/bio-routing/bio-rd/protocols/ris/metrics"
"github.com/bio-routing/bio-rd/routingtable/vrf"
"google.golang.org/grpc"
)
diff --git a/metrics/ris-mirror/adapter/prom/ris_mirror_prom_adapter.go b/metrics/ris-mirror/adapter/prom/ris_mirror_prom_adapter.go
index 95b6f79c..405a2e1e 100644
--- a/metrics/ris-mirror/adapter/prom/ris_mirror_prom_adapter.go
+++ b/metrics/ris-mirror/adapter/prom/ris_mirror_prom_adapter.go
@@ -2,7 +2,7 @@ package prom
import (
"github.com/bio-routing/bio-rd/cmd/ris-mirror/rismirror"
- "github.com/bio-routing/bio-rd/protocols/ris/metrics"
+ "github.com/bio-routing/bio-rd/cmd/ris-mirror/rismirror/metrics"
"github.com/prometheus/client_golang/prometheus"
vrf_prom "github.com/bio-routing/bio-rd/metrics/vrf/adapter/prom"
@@ -12,18 +12,6 @@ const (
prefix = "bio_rismirror_"
)
-var (
- risMirrorSessionEstablishedDesc *prometheus.Desc
- risMirrorObserveRIBMessages *prometheus.Desc
-)
-
-func init() {
- labels := []string{"sys_name", "agent_address"}
-
- risMirrorSessionEstablishedDesc = prometheus.NewDesc(prefix+"session_established", "Indicates if a RIS session is established", labels, nil)
- risMirrorObserveRIBMessages = prometheus.NewDesc(prefix+"observe_rib_messages", "Returns number of received rib monitoring messages", labels, nil)
-}
-
// NewCollector creates a new collector instance for the given RIS mirror server
func NewCollector(risMirror *rismirror.RISMirror) prometheus.Collector {
return &risCollector{
@@ -38,9 +26,6 @@ type risCollector struct {
// Describe conforms to the prometheus collector interface
func (c *risCollector) Describe(ch chan<- *prometheus.Desc) {
- /*ch <- risMirrorSessionEstablishedDesc
- ch <- risMirrorObserveRIBMessages*/
-
vrf_prom.DescribeRouter(ch)
}
@@ -52,17 +37,6 @@ func (c *risCollector) Collect(ch chan<- prometheus.Metric) {
}
func (c *risCollector) collectForRouter(ch chan<- prometheus.Metric, rtr *metrics.RISMirrorRouterMetrics) {
-
- /*l := []string{rtr.SysName, rtr.Address.String()}
-
- ch <- prometheus.MustNewConstMetric(routeMonitoringMessagesDesc, prometheus.CounterValue, float64(rtr.RouteMonitoringMessages), l...)
- ch <- prometheus.MustNewConstMetric(statisticsReportMessages, prometheus.CounterValue, float64(rtr.StatisticsReportMessages), l...)
- ch <- prometheus.MustNewConstMetric(peerDownNotificationMessages, prometheus.CounterValue, float64(rtr.PeerDownNotificationMessages), l...)
- ch <- prometheus.MustNewConstMetric(peerUpNotificationMessages, prometheus.CounterValue, float64(rtr.PeerUpNotificationMessages), l...)
- ch <- prometheus.MustNewConstMetric(initiationMessages, prometheus.CounterValue, float64(rtr.InitiationMessages), l...)
- ch <- prometheus.MustNewConstMetric(terminationMessages, prometheus.CounterValue, float64(rtr.TerminationMessages), l...)
- ch <- prometheus.MustNewConstMetric(routeMirroringMessages, prometheus.CounterValue, float64(rtr.RouteMirroringMessages), l...)*/
-
for _, vrfMetric := range rtr.VRFMetrics {
vrf_prom.CollectForVRFRouter(ch, rtr.SysName, rtr.Address.String(), vrfMetric)
}
diff --git a/protocols/ris/metrics/ris_mirror_metrics.go b/protocols/ris/metrics/ris_mirror_metrics.go
deleted file mode 100644
index 33f1867b..00000000
--- a/protocols/ris/metrics/ris_mirror_metrics.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package metrics
-
-import (
- "net"
-
- vrf_metrics "github.com/bio-routing/bio-rd/routingtable/vrf/metrics"
-)
-
-// RISMirrorMetrics contains per router BMP metrics
-type RISMirrorMetrics struct {
- Routers []*RISMirrorRouterMetrics
-}
-
-// RISMirrorRouterMetrics contains a routers RIS mirror metrics
-type RISMirrorRouterMetrics struct {
- // Routers IP Address
- Address net.IP
-
- // SysName of the monitored router
- SysName string
-
- // VRFMetrics represent per VRF metrics
- VRFMetrics []*vrf_metrics.VRFMetrics
-
- RTMirrorMetrics []*RTMirrorMetrics
-}
-
-type RTMirrorMetrics struct {
- RTMirrorRISStates []*RTMirrorRISState
- UniqueRoutes uint64
- RoutesWithSingleSource uint64
-}
-
-type RTMirrorRISState struct {
- Target string
- ConnectionState string
- RTMirrorRISAFIStates []*RTMirrorRISAFIState
-}
-
-type RTMirrorRISAFIState struct {
- AFI uint8
- Operational bool
-}
--
GitLab