delete connect to ovsdb for ovn-monitor

kubeovn · Jan 22, 2021 · f1efaa7 · f1efaa7
1 parent eeaf744
commit f1efaa7
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 114 deletions.
diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh
@@ -725,18 +725,10 @@ spec:
               value: "$ENABLE_SSL"
             - name: NODE_IPS
               value: $addresses
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: POD_NAMESPACE
+            - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.namespace
+                  fieldPath: spec.nodeName
           resources:
             requests:
               cpu: 200m
@@ -1230,18 +1222,10 @@ spec:
               value: "$ENABLE_SSL"
             - name: NODE_IPS
               value: $addresses
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: POD_NAMESPACE
+            - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.namespace
+                  fieldPath: spec.nodeName
           resources:
             requests:
               cpu: 200m

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -763,18 +763,10 @@ spec:
               value: "$ENABLE_SSL"
             - name: NODE_IPS
               value: $addresses
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: POD_NAMESPACE
+            - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.namespace
+                  fieldPath: spec.nodeName
           resources:
             requests:
               cpu: 200m
@@ -1267,18 +1259,10 @@ spec:
               value: "$ENABLE_SSL"
             - name: NODE_IPS
               value: $addresses
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: POD_NAMESPACE
+            - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.namespace
+                  fieldPath: spec.nodeName
           resources:
             requests:
               cpu: 200m

diff --git a/go.mod b/go.mod
@@ -45,4 +45,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.7.0
 )
 
-replace k8s.io/client-go => k8s.io/client-go v0.20.1-rc.1
+replace (
+	k8s.io/client-go => k8s.io/client-go v0.20.1-rc.1
+	github.com/greenpau/ovsdb => github.com/alauda/ovsdb v0.0.0-20210113100339-040cf3e76c28
+)
diff --git a/go.sum b/go.sum
@@ -51,6 +51,8 @@ github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4Rq
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/alauda/felix v3.6.6-0.20201207121355-187332daf314+incompatible h1:f8w9fTcjS9/Zdw57Law9JsFxh/sttnBor4TGkWQpSf8=
 github.com/alauda/felix v3.6.6-0.20201207121355-187332daf314+incompatible/go.mod h1:NeFJ7/fvKQ8X9styGJvh7sHmZoUprV5ZKzE2Ey82BEA=
+github.com/alauda/ovsdb v0.0.0-20210113100339-040cf3e76c28 h1:FW5M3SAwSGBdtTboeV5sI7kEY6zraApSZQxTUfZ7LQY=
+github.com/alauda/ovsdb v0.0.0-20210113100339-040cf3e76c28/go.mod h1:dXpg+IAC2yp2IZQlEVmnmEc1rqEmSZzgNfu6+ai38J4=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

diff --git a/pkg/ovnmonitor/exporter.go b/pkg/ovnmonitor/exporter.go
@@ -55,11 +55,6 @@ func NewExporter(cfg *Configuration) *Exporter {
 	e := Exporter{}
 	e.Client = ovsdb.NewOvnClient()
 	e.initParas(cfg)
-
-	if err := e.Client.GetSystemID(); err != nil {
-		klog.Errorf("%s failed to get system id: %s", appName, err)
-	}
-
 	return &e
 }
 
@@ -68,6 +63,7 @@ func (e *Exporter) initParas(cfg *Configuration) {
 	e.pollInterval = cfg.PollInterval
 
 	e.Client.Timeout = cfg.PollTimeout
+	e.Client.System.Hostname = os.Getenv("KUBE_NODE_NAME")
 	e.Client.System.RunDir = cfg.SystemRunDir
 	e.Client.Database.Vswitch.Name = cfg.DatabaseVswitchName
 	e.Client.Database.Vswitch.Socket.Remote = cfg.DatabaseVswitchSocketRemote
@@ -107,12 +103,7 @@ func (e *Exporter) StartConnection() error {
 	if err := e.Client.Connect(); err != nil {
 		return err
 	}
-
-	if err := e.Client.GetSystemInfo(); err != nil {
-		return err
-	}
 	klog.Infof("%s: exporter connect successfully", e.Client.System.Hostname)
-
 	return nil
 }
 
@@ -128,11 +119,7 @@ func (e *Exporter) TryClientConnection() {
 			tryConnectCnt++
 			klog.Errorf("%s: ovn-monitor failed to reconnect db socket %v times", e.Client.System.Hostname, tryConnectCnt)
 		} else {
-			if err := e.Client.GetSystemID(); err != nil {
-				klog.Errorf("%s failed to get system id: %s", appName, err)
-			} else {
-				klog.Infof("%s: ovn-monitor reconnect db successfully", e.Client.System.ID)
-			}
+			klog.Infof("%s: ovn-monitor reconnect db successfully", e.Client.System.Hostname)
 			break
 		}
 
@@ -156,7 +143,6 @@ func (e *Exporter) StartOvnMetrics() {
 func (e *Exporter) ovnMetricsUpdate() {
 	for {
 		e.exportOvnStatusGauge()
-		e.exportOvnInfoGauge()
 		e.exportOvnLogFileSizeGauge()
 		e.exportOvnDBFileSizeGauge()
 		e.exportOvnRequestErrorGauge()
@@ -187,16 +173,6 @@ func (e *Exporter) exportOvnStatusGauge() {
 	}
 }
 
-func (e *Exporter) exportOvnInfoGauge() {
-	if err := e.Client.GetSystemInfo(); err != nil {
-		klog.Errorf("Failed to get System Info")
-		return
-	}
-	metricOvnInfo.WithLabelValues(e.Client.System.ID, e.Client.System.RunDir, e.Client.System.Hostname,
-		e.Client.System.Type, e.Client.System.Version, e.Client.Database.Vswitch.Version,
-		e.Client.Database.Vswitch.Schema.Version).Set(1)
-}
-
 func (e *Exporter) exportOvnLogFileSizeGauge() {
 	components := []string{
 		"ovsdb-server-southbound",

diff --git a/pkg/ovnmonitor/metric.go b/pkg/ovnmonitor/metric.go
@@ -11,22 +11,6 @@ var (
 			Help:      "OVN Health Status. The values are: health(1), unhealth(0).",
 		})
 
-	metricOvnInfo = prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: metricNamespace,
-			Name:      "ovn_info",
-			Help:      "This metric provides basic information about OVN. It is always set to 1.",
-		},
-		[]string{
-			"system_id",
-			"rundir",
-			"hostname",
-			"system_type",
-			"system_version",
-			"ovs_version",
-			"db_version",
-		})
-
 	metricRequestErrorNums = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Namespace: metricNamespace,
@@ -466,7 +450,6 @@ var (
 func registerOvnMetrics() {
 	// ovn status metrics
 	prometheus.MustRegister(metricOvnHealthyStatus)
-	prometheus.MustRegister(metricOvnInfo)
 	prometheus.MustRegister(metricRequestErrorNums)
 	prometheus.MustRegister(metricLogFileSize)
 	prometheus.MustRegister(metricDBFileSize)

diff --git a/pkg/ovnmonitor/util.go b/pkg/ovnmonitor/util.go
@@ -18,14 +18,6 @@ func (e *Exporter) IncrementErrorCounter() {
 }
 
 func (e *Exporter) getOvnStatus() (bool, error) {
-	var err error
-
-	if err = e.Client.GetSystemInfo(); err != nil {
-		klog.Errorf("%s: %v", e.Client.Database.Vswitch.Name, err)
-		e.IncrementErrorCounter()
-		return false, err
-	}
-
 	components := []string{
 		"ovsdb-server-southbound",
 		"ovsdb-server-northbound",

diff --git a/vendor/github.com/greenpau/ovsdb/Makefile b/vendor/github.com/greenpau/ovsdb/Makefile
diff --git a/vendor/github.com/greenpau/ovsdb/VERSION b/vendor/github.com/greenpau/ovsdb/VERSION
diff --git a/vendor/github.com/greenpau/ovsdb/go.mod b/vendor/github.com/greenpau/ovsdb/go.mod
diff --git a/vendor/github.com/greenpau/ovsdb/ovn.go b/vendor/github.com/greenpau/ovsdb/ovn.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -73,7 +73,7 @@ github.com/googleapis/gnostic/compiler
 github.com/googleapis/gnostic/extensions
 github.com/googleapis/gnostic/jsonschema
 github.com/googleapis/gnostic/openapiv2
-# github.com/greenpau/ovsdb v0.0.0-20181114004433-3582b85e8968
+# github.com/greenpau/ovsdb v0.0.0-20181114004433-3582b85e8968 => github.com/alauda/ovsdb v0.0.0-20210113100339-040cf3e76c28
 github.com/greenpau/ovsdb
 # github.com/hashicorp/golang-lru v0.5.4
 github.com/hashicorp/golang-lru

diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
@@ -277,18 +277,10 @@ spec:
               value: "false"
             - name: NODE_IPS
               value: $addresses
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: POD_NAMESPACE
+            - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.namespace
+                  fieldPath: spec.nodeName
           resources:
             requests:
               cpu: 500m