Merge pull request #419 from weaveworks/metric-template

Implement metric templates for Prometheus
fluxcd · Feb 7, 2020 · ea39041 · ea39041
2 parents 1cca5a4 + eec287a
commit ea39041
Show file tree

Hide file tree

Showing 69 changed files with 2,845 additions and 883 deletions.
diff --git a/artifacts/flagger/account.yaml b/artifacts/flagger/account.yaml
@@ -42,6 +42,8 @@ rules:
     resources:
       - canaries
       - canaries/status
+      - metrictemplates
+      - metrictemplates/status
     verbs: ["*"]
   - apiGroups:
       - networking.istio.io

diff --git a/artifacts/flagger/crd.yaml b/artifacts/flagger/crd.yaml
@@ -215,18 +215,29 @@ spec:
                       required: ["name", "threshold"]
                       properties:
                         name:
-                          description: Name of the Prometheus metric
+                          description: Name of the metric
                           type: string
                         interval:
-                          description: Interval of the promql query
+                          description: Interval of the query
                           type: string
                           pattern: "^[0-9]+(m|s)"
                         threshold:
-                          description: Max scalar value accepted for this metric
+                          description: Max value accepted for this metric
                           type: number
                         query:
                           description: Prometheus query
                           type: string
+                        templateRef:
+                          description: Metric template reference
+                          type: object
+                          required: ["name"]
+                          properties:
+                            name:
+                              description: Name of this metric template
+                              type: string
+                            namespace:
+                              description: Namespace of this metric template
+                              type: string
                 webhooks:
                   description: Webhook list for this canary
                   type: array
@@ -322,3 +333,62 @@ spec:
                     type:
                       description: Type of this condition
                       type: string
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: metrictemplates.flagger.app
+  annotations:
+    helm.sh/resource-policy: keep
+spec:
+  group: flagger.app
+  version: v1alpha1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+  names:
+    plural: metrictemplates
+    singular: metrictemplate
+    kind: MetricTemplate
+    categories:
+      - all
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          required:
+            - provider
+            - query
+          properties:
+            provider:
+              description: Provider of this metric template
+              type: object
+              required:
+                - type
+                - address
+              properties:
+                type:
+                  description: Type of this provider
+                  type: string
+                  enum:
+                    - prometheus
+                    - influxdb
+                address:
+                  description: API address of this provider
+                  type: string
+                secretRef:
+                  description: Kubernetes secret reference containing the provider credentials
+                  type: object
+                  required:
+                    - name
+                  properties:
+                    name:
+                      description: Name of the Kubernetes secret
+                      type: string
+            query:
+              description: Query of this metric template
+              type: string
diff --git a/charts/flagger/templates/crd.yaml b/charts/flagger/templates/crd.yaml
@@ -78,7 +78,7 @@ spec:
             targetRef:
               description: Deployment selector
               type: object
-              required: ['apiVersion', 'kind', 'name']
+              required: ["apiVersion", "kind", "name"]
               properties:
                 apiVersion:
                   type: string
@@ -91,7 +91,7 @@ spec:
               anyOf:
                 - type: string
                 - type: object
-              required: ['apiVersion', 'kind', 'name']
+              required: ["apiVersion", "kind", "name"]
               properties:
                 apiVersion:
                   type: string
@@ -104,7 +104,7 @@ spec:
               anyOf:
                 - type: string
                 - type: object
-              required: ['apiVersion', 'kind', 'name']
+              required: ["apiVersion", "kind", "name"]
               properties:
                 apiVersion:
                   type: string
@@ -114,7 +114,7 @@ spec:
                   type: string
             service:
               type: object
-              required: ['port']
+              required: ["port"]
               properties:
                 name:
                   description: Kubernetes service name
@@ -213,21 +213,32 @@ spec:
                   properties:
                     items:
                       type: object
-                      required: ['name', 'threshold']
+                      required: ["name", "threshold"]
                       properties:
                         name:
-                          description: Name of the Prometheus metric
+                          description: Name of the metric
                           type: string
                         interval:
-                          description: Interval of the promql query
+                          description: Interval of the query
                           type: string
                           pattern: "^[0-9]+(m|s)"
                         threshold:
-                          description: Max scalar value accepted for this metric
+                          description: Max value accepted for this metric
                           type: number
                         query:
                           description: Prometheus query
                           type: string
+                        templateRef:
+                          description: Metric template reference
+                          type: object
+                          required: ["name"]
+                          properties:
+                            name:
+                              description: Name of this metric template
+                              type: string
+                            namespace:
+                              description: Namespace of this metric template
+                              type: string
                 webhooks:
                   description: Webhook list for this canary
                   type: array
@@ -301,7 +312,7 @@ spec:
               properties:
                 items:
                   type: object
-                  required: ['type', 'status', 'reason']
+                  required: ["type", "status", "reason"]
                   properties:
                     lastTransitionTime:
                       description: LastTransitionTime of this condition
@@ -323,4 +334,63 @@ spec:
                     type:
                       description: Type of this condition
                       type: string
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: metrictemplates.flagger.app
+  annotations:
+    helm.sh/resource-policy: keep
+spec:
+  group: flagger.app
+  version: v1alpha1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+  names:
+    plural: metrictemplates
+    singular: metrictemplate
+    kind: MetricTemplate
+    categories:
+      - all
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          required:
+            - provider
+            - query
+          properties:
+            provider:
+              description: Provider of this metric template
+              type: object
+              required:
+                - type
+                - address
+              properties:
+                type:
+                  description: Type of this provider
+                  type: string
+                  enum:
+                    - prometheus
+                    - influxdb
+                address:
+                  description: API address of this provider
+                  type: string
+                secretRef:
+                  description: Kubernetes secret reference containing the provider credentials
+                  type: object
+                  required:
+                    - name
+                  properties:
+                    name:
+                      description: Name of the Kubernetes secret
+                      type: string
+            query:
+              description: Query of this metric template
+              type: string
 {{- end }}
diff --git a/charts/flagger/templates/rbac.yaml b/charts/flagger/templates/rbac.yaml
@@ -38,6 +38,8 @@ rules:
     resources:
       - canaries
       - canaries/status
+      - metrictemplates
+      - metrictemplates/status
     verbs: ["*"]
   - apiGroups:
       - networking.istio.io