feat: add exporter rbac (#246)

* feat: add exporter rbac * fix: owner * feat: support exporter filter * fix: comments * fix: remove code * fix: remove
vesoft-inc · Aug 22, 2023 · 0137212 · 0137212
1 parent 3eed8d8
commit 0137212
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 10 deletions.
diff --git a/apis/apps/v1alpha1/exporter.go b/apis/apps/v1alpha1/exporter.go
@@ -20,6 +20,8 @@ package v1alpha1
 type NebulaExporterComponent interface {
 	ComponentSpec() ComponentAccessor
 	MaxRequests() int32
+	CollectRegex() string
+	IgnoreRegex() string
 }
 
 var _ NebulaExporterComponent = &exporterComponent{}
@@ -41,3 +43,11 @@ func (e *exporterComponent) ComponentSpec() ComponentAccessor {
 func (e *exporterComponent) MaxRequests() int32 {
 	return e.nc.Spec.Exporter.MaxRequests
 }
+
+func (e *exporterComponent) CollectRegex() string {
+	return e.nc.Spec.Exporter.CollectRegex
+}
+
+func (e *exporterComponent) IgnoreRegex() string {
+	return e.nc.Spec.Exporter.IgnoreRegex
+}
diff --git a/apis/apps/v1alpha1/nebulacluster_types.go b/apis/apps/v1alpha1/nebulacluster_types.go
@@ -224,6 +224,14 @@ type ExporterSpec struct {
 	// +kubebuilder:default=40
 	// +optional
 	MaxRequests int32 `json:"maxRequests,omitempty"`
+
+	// CollectRegex means the regex to filter metrics
+	// +optional
+	CollectRegex string `json:"collectRegex,omitempty"`
+
+	// IgnoreRegex means the regex to ignore metrics
+	// +optional
+	IgnoreRegex string `json:"ignoreRegex,omitempty"`
 }
 
 // AgentContainerSpec defines the desired state of Agent

diff --git a/config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml b/config/crd/bases/apps.nebula-graph.io_nebulaclusters.yaml
@@ -839,6 +839,8 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  collectRegex:
+                    type: string
                   env:
                     items:
                       properties:
@@ -903,6 +905,8 @@ spec:
                       - name
                       type: object
                     type: array
+                  ignoreRegex:
+                    type: string
                   image:
                     type: string
                   initContainers:

diff --git a/pkg/controller/component/exporter.go b/pkg/controller/component/exporter.go
@@ -103,8 +103,12 @@ func (e *nebulaExporter) generateDeployment(nc *v1alpha1.NebulaCluster) *appsv1.
 		Name:  "ng-exporter",
 		Image: nc.ExporterComponent().ComponentSpec().PodImage(),
 		Args: []string{
-			"--listen-address=0.0.0.0:9100", fmt.Sprintf("--namespace=%s", namespace),
-			fmt.Sprintf("--cluster=%s", ncName), fmt.Sprintf("--max-request=%d", nc.ExporterComponent().MaxRequests()),
+			"--listen-address=0.0.0.0:9100",
+			fmt.Sprintf("--namespace=%s", namespace),
+			fmt.Sprintf("--cluster=%s", ncName),
+			fmt.Sprintf("--max-request=%d", nc.ExporterComponent().MaxRequests()),
+			fmt.Sprintf("--collect=%s", nc.ExporterComponent().CollectRegex()),
+			fmt.Sprintf("--ignore=%s", nc.ExporterComponent().IgnoreRegex()),
 		},
 		Env: nc.ExporterComponent().ComponentSpec().PodEnvVars(),
 		Ports: []corev1.ContainerPort{
@@ -165,14 +169,15 @@ func (e *nebulaExporter) generateDeployment(nc *v1alpha1.NebulaCluster) *appsv1.
 					Annotations: nc.ExporterComponent().ComponentSpec().PodAnnotations(),
 				},
 				Spec: corev1.PodSpec{
-					SchedulerName:    nc.Spec.SchedulerName,
-					NodeSelector:     nc.ExporterComponent().ComponentSpec().NodeSelector(),
-					InitContainers:   nc.ExporterComponent().ComponentSpec().InitContainers(),
-					Containers:       containers,
-					ImagePullSecrets: nc.Spec.ImagePullSecrets,
-					Affinity:         nc.ExporterComponent().ComponentSpec().Affinity(),
-					Tolerations:      nc.ExporterComponent().ComponentSpec().Tolerations(),
-					Volumes:          nc.ExporterComponent().ComponentSpec().SidecarVolumes(),
+					SchedulerName:      nc.Spec.SchedulerName,
+					NodeSelector:       nc.ExporterComponent().ComponentSpec().NodeSelector(),
+					InitContainers:     nc.ExporterComponent().ComponentSpec().InitContainers(),
+					Containers:         containers,
+					ImagePullSecrets:   nc.Spec.ImagePullSecrets,
+					Affinity:           nc.ExporterComponent().ComponentSpec().Affinity(),
+					Tolerations:        nc.ExporterComponent().ComponentSpec().Tolerations(),
+					Volumes:            nc.ExporterComponent().ComponentSpec().SidecarVolumes(),
+					ServiceAccountName: v1alpha1.NebulaServiceAccountName,
 				},
 			},
 		},