fix: change interval name and fix examples

api/v1alpha1/federatedmanagedmetric_types.go

@@ -38,8 +38,8 @@ type FederatedManagedMetricSpec struct {
 	// Projections []Projection `json:"projections,omitempty"`
 
 	// Define in what interval the query should be recorded
-	// +kubebuilder:default:="12h"
-	CheckInterval metav1.Duration `json:"checkInterval,omitempty"`
+	// +kubebuilder:default:="10m"
+	Interval metav1.Duration `json:"interval,omitempty"`
 
 	FederatedClusterAccessRef FederateClusterAccessRef `json:"federateClusterAccessRef,omitempty"`
 }

api/v1alpha1/federatedmetric_types.go

@@ -41,8 +41,8 @@ type FederatedMetricSpec struct {
 	Projections []Projection `json:"projections,omitempty"`
 
 	// Define in what interval the query should be recorded
-	// +kubebuilder:default:="12h"
-	CheckInterval metav1.Duration `json:"checkInterval,omitempty"`
+	// +kubebuilder:default:="10m"
+	Interval metav1.Duration `json:"interval,omitempty"`
 
 	FederatedClusterAccessRef FederateClusterAccessRef `json:"federateClusterAccessRef,omitempty"`
 }

api/v1alpha1/managedmetric_types.go

@@ -43,8 +43,8 @@ type ManagedMetricSpec struct {
 	// +optional
 	FieldSelector string `json:"fieldSelector,omitempty"`
 	// Define in what interval the query should be recorded
-	// +kubebuilder:default:="12h"
-	CheckInterval metav1.Duration `json:"checkInterval,omitempty"`
+	// +kubebuilder:default:="10m"
+	Interval metav1.Duration `json:"interval,omitempty"`
 
 	RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
 }

api/v1alpha1/metric_types.go

@@ -52,8 +52,8 @@ type MetricSpec struct {
 	// +optional
 	FieldSelector string `json:"fieldSelector,omitempty"`
 	// Define in what interval the query should be recorded
-	// +kubebuilder:default:="12h"
-	CheckInterval metav1.Duration `json:"checkInterval,omitempty"`
+	// +kubebuilder:default:="10m"
+	Interval metav1.Duration `json:"interval,omitempty"`
 
 	RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
 

cmd/embedded/crds/metrics.cloud.sap_federatedmanagedmetrics.yaml

@@ -40,10 +40,6 @@ spec:
           spec:
             description: FederatedManagedMetricSpec defines the desired state of FederatedManagedMetric
             properties:
-              checkInterval:
-                default: 12h
-                description: Define in what interval the query should be recorded
-                type: string
               description:
                 type: string
               federateClusterAccessRef:
@@ -58,6 +54,10 @@ spec:
                 description: Define fields of your object to adapt filters of the
                   query
                 type: string
+              interval:
+                default: 10m
+                description: Define in what interval the query should be recorded
+                type: string
               labelSelector:
                 description: Define labels of your object to adapt filters of the
                   query

cmd/embedded/crds/metrics.cloud.sap_federatedmetrics.yaml

@@ -39,10 +39,6 @@ spec:
           spec:
             description: FederatedMetricSpec defines the desired state of FederatedMetric
             properties:
-              checkInterval:
-                default: 12h
-                description: Define in what interval the query should be recorded
-                type: string
               description:
                 type: string
               federateClusterAccessRef:
@@ -57,6 +53,10 @@ spec:
                 description: Define fields of your object to adapt filters of the
                   query
                 type: string
+              interval:
+                default: 10m
+                description: Define in what interval the query should be recorded
+                type: string
               labelSelector:
                 description: Define labels of your object to adapt filters of the
                   query

cmd/embedded/crds/metrics.cloud.sap_managedmetrics.yaml

@@ -49,10 +49,6 @@ spec:
           spec:
             description: ManagedMetricSpec defines the desired state of ManagedMetric
             properties:
-              checkInterval:
-                default: 12h
-                description: Define in what interval the query should be recorded
-                type: string
               description:
                 description: Sets the description that will be used to identify the
                   metric in Dynatrace(or other providers)
@@ -65,6 +61,10 @@ spec:
                 description: Define the group of your object that should be instrumented
                   (without version at the end)
                 type: string
+              interval:
+                default: 10m
+                description: Define in what interval the query should be recorded
+                type: string
               kind:
                 description: Decide which kind the metric should keep track of (needs
                   to be plural version)

cmd/embedded/crds/metrics.cloud.sap_metrics.yaml

@@ -49,10 +49,6 @@ spec:
           spec:
             description: MetricSpec defines the desired state of Metric
             properties:
-              checkInterval:
-                default: 12h
-                description: Define in what interval the query should be recorded
-                type: string
               description:
                 description: Sets the description that will be used to identify the
                   metric in Dynatrace(or other providers)
@@ -61,6 +57,10 @@ spec:
                 description: Define fields of your object to adapt filters of the
                   query
                 type: string
+              interval:
+                default: 10m
+                description: Define in what interval the query should be recorded
+                type: string
               labelSelector:
                 description: Define labels of your object to adapt filters of the
                   query

config/crd/bases/metrics.cloud.sap_federatedmanagedmetrics.yaml

@@ -40,10 +40,6 @@ spec:
           spec:
             description: FederatedManagedMetricSpec defines the desired state of FederatedManagedMetric
             properties:
-              checkInterval:
-                default: 12h
-                description: Define in what interval the query should be recorded
-                type: string
               description:
                 type: string
               federateClusterAccessRef:
@@ -58,6 +54,10 @@ spec:
                 description: Define fields of your object to adapt filters of the
                   query
                 type: string
+              interval:
+                default: 10m
+                description: Define in what interval the query should be recorded
+                type: string
               labelSelector:
                 description: Define labels of your object to adapt filters of the
                   query

config/crd/bases/metrics.cloud.sap_federatedmetrics.yaml

@@ -39,10 +39,6 @@ spec:
           spec:
             description: FederatedMetricSpec defines the desired state of FederatedMetric
             properties:
-              checkInterval:
-                default: 12h
-                description: Define in what interval the query should be recorded
-                type: string
               description:
                 type: string
               federateClusterAccessRef:
@@ -57,6 +53,10 @@ spec:
                 description: Define fields of your object to adapt filters of the
                   query
                 type: string
+              interval:
+                default: 10m
+                description: Define in what interval the query should be recorded
+                type: string
               labelSelector:
                 description: Define labels of your object to adapt filters of the
                   query

config/crd/bases/metrics.cloud.sap_managedmetrics.yaml

@@ -49,10 +49,6 @@ spec:
           spec:
             description: ManagedMetricSpec defines the desired state of ManagedMetric
             properties:
-              checkInterval:
-                default: 12h
-                description: Define in what interval the query should be recorded
-                type: string
               description:
                 description: Sets the description that will be used to identify the
                   metric in Dynatrace(or other providers)
@@ -65,6 +61,10 @@ spec:
                 description: Define the group of your object that should be instrumented
                   (without version at the end)
                 type: string
+              interval:
+                default: 10m
+                description: Define in what interval the query should be recorded
+                type: string
               kind:
                 description: Decide which kind the metric should keep track of (needs
                   to be plural version)

config/crd/bases/metrics.cloud.sap_metrics.yaml

@@ -49,10 +49,6 @@ spec:
           spec:
             description: MetricSpec defines the desired state of Metric
             properties:
-              checkInterval:
-                default: 12h
-                description: Define in what interval the query should be recorded
-                type: string
               description:
                 description: Sets the description that will be used to identify the
                   metric in Dynatrace(or other providers)
@@ -61,6 +57,10 @@ spec:
                 description: Define fields of your object to adapt filters of the
                   query
                 type: string
+              interval:
+                default: 10m
+                description: Define in what interval the query should be recorded
+                type: string
               labelSelector:
                 description: Define labels of your object to adapt filters of the
                   query

examples/basic_metric.yaml

@@ -9,7 +9,7 @@ spec:
     kind: release
     group: helm.crossplane.io
     version: v1beta1
-  checkInterval: 1m # in minutes
+  interval: 1m # in minutes
 ---
 apiVersion: metrics.cloud.sap/v1alpha1
 kind: Metric
@@ -22,7 +22,7 @@ spec:
     kind: pod
     group: ""
     version: v1
-  checkInterval: 1m # in minutes
+  interval: 1m # in minutes
   projections:
     - name: pod-namespace
       fieldPath: "metadata.namespace"
@@ -38,7 +38,7 @@ spec:
     kind: pod
     group: ""
     version: v1
-  checkInterval: 1m # in minutes
+  interval: 1m # in minutes
 
 #apiVersion: metrics.cloud.sap/v1alpha1
 #kind: Metric

examples/dev-core/metric.yaml

@@ -5,8 +5,9 @@ metadata:
 spec:
   name: dev-core-landscaperdeployment
   description: Number of LandscapperDeplyoments in the LS-DEV-CORE cluster
-  kind: LandscaperDeployment
-  group: landscaper-service.gardener.cloud
-  version: v1alpha1
-  checkInterval: "1m" # in minutes
+  target:
+    kind: LandscaperDeployment
+    group: landscaper-service.gardener.cloud
+    version: v1alpha1
+  interval: "1m" # in minutes
 ---

examples/fed-managed-resoruces/crossplane-managed.yaml

@@ -1,12 +1,12 @@
-apiVersion: metrics.cloud.sap/v1beta1
+apiVersion: metrics.cloud.sap/v1alpha1
 kind: FederatedManagedMetric
 metadata:
   name: xfed-managed
 spec:
   name: xfed-managed
   description: crossplane managed resources
-  checkInterval: "1m" # in minutes
-  federateCaRef:
+  interval: "1m" # in minutes
+  federateClusterAccessRef:
     name: federate-ca-sample
     namespace: default
 ---

examples/federated-resources/crdsdeletion.yaml

@@ -1,4 +1,4 @@
-apiVersion: metrics.cloud.sap/v1beta1
+apiVersion: metrics.cloud.sap/v1alpha1
 kind: FederatedMetric
 metadata:
   name: xfed-crds-del
@@ -7,16 +7,16 @@ spec:
   description: subaccounts
   target:
     group:  apiextensions.k8s.io
-    resource: customresourcedefinitions
+    kind: customresourcedefinition
     version: v1
   fieldSelector: "metadata.deletionTimestamp"
-  checkInterval: "1m" # in minutes
+  interval: "1m" # in minutes
   projections:
     - name: deletion
       fieldPath: "metadata.deletionTimestamp"
     - name: crd.name
       fieldPath: "metadata.name"
-  federateCaRef:
+  federateClusterAccessRef:
     name: federate-ca-sample
     namespace: default
 ---

examples/federated-resources/entitlements.yaml

@@ -1,4 +1,4 @@
-apiVersion: metrics.cloud.sap/v1beta1
+apiVersion: metrics.cloud.sap/v1alpha1
 kind: FederatedMetric
 metadata:
   name: xfed-entitlements
@@ -7,13 +7,13 @@ spec:
   description: entitlements
   target:
     group:  account.btp.orchestrate.cloud.sap
-    resource: entitlements
+    kind: Entitlement
     version: v1alpha1
-  checkInterval: "1m" # in minutes
+  interval: "1m" # in minutes
   projections:
     - name: servicename
       fieldPath: "spec.forProvider.serviceName"
-  federateCaRef:
+  federateClusterAccessRef:
     name: federate-ca-sample
     namespace: default
 ---

examples/federated-resources/serviceinstances.yaml

@@ -1,4 +1,4 @@
-apiVersion: metrics.cloud.sap/v1beta1
+apiVersion: metrics.cloud.sap/v1alpha1
 kind: FederatedMetric
 metadata:
   name: xfed-instances
@@ -7,10 +7,10 @@ spec:
   description: service instances
   target:
     group:  services.cloud.sap.com
-    resource: serviceinstances
+    kind: ServiceInstance
     version: v1
-  checkInterval: "1m" # in minutes
-  federateCaRef:
+  interval: "1m" # in minutes
+  federateClusterAccessRef:
     name: federate-ca-sample
     namespace: default
 ---