Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEAT] added version monitoring for cleanup #132

Merged
merged 10 commits into from
Sep 25, 2024
Merged

[FEAT] added version monitoring for cleanup #132

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a3049c
[FEAT] added version cleanup monitoring
skrishnan-sap Sep 6, 2024
25b7cdd
[Misc] prometheus-operator dependecy updated
Pavan-SAP Sep 20, 2024
3d1648d
[website] update docsy + added version monitoring docs (#134)
skrishnan-sap Sep 20, 2024
8882e6b
added whats's new page
skrishnan-sap Sep 21, 2024
922a8ec
[Misc] updated
Pavan-SAP Sep 23, 2024
594431d
enable code highlighting
skrishnan-sap Sep 23, 2024
b3af0f5
Update whats-new.md
skrishnan-sap Sep 24, 2024
aa841af
adjusted copyright
skrishnan-sap Sep 24, 2024
479f970
minor fix to cav code/import
Pavan-SAP Sep 25, 2024
de978ed
Update reconcile-capapplicationversion.go
Pavan-SAP Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions internal/controller/reconcile-capapplicationversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and cap-operator contributors
SPDX-License-Identifier: Apache-2.0
*/
Expand All @@ -25,7 +25,6 @@ import (
apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Pavan-SAP marked this conversation as resolved.
Show resolved Hide resolved
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/intstr"
)
Expand Down Expand Up @@ -447,7 +446,7 @@ func newService(ca *v1alpha1.CAPApplication, cav *v1alpha1.CAPApplicationVersion
// #region ServiceMonitor
func (c *Controller) checkServiceMonitorCapability(ctx context.Context) error {
crdName := "servicemonitors.monitoring.coreos.com"
crd, err := c.apiExtClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, crdName, v1.GetOptions{})
crd, err := c.apiExtClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, crdName, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("could not get custom resource definition %s: %v", crdName, err)
}
Expand Down Expand Up @@ -496,12 +495,12 @@ func (c *Controller) updateServiceMonitors(ctx context.Context, ca *v1alpha1.CAP
return fmt.Errorf("invalid port reference in workload %s monitoring config of version %s", wl.Name, cav.Name)
}

sm, err := c.promClient.MonitoringV1().ServiceMonitors(cav.Namespace).Get(ctx, wlPortInfos.WorkloadName+ServiceSuffix, v1.GetOptions{})
sm, err := c.promClient.MonitoringV1().ServiceMonitors(cav.Namespace).Get(ctx, wlPortInfos.WorkloadName+ServiceSuffix, metav1.GetOptions{})
if err != nil {
if k8sErrors.IsNotFound(err) {
sm, err = c.promClient.MonitoringV1().ServiceMonitors(cav.Namespace).Create(ctx, newServiceMonitor(ca, cav, &wl, wlPortInfos), v1.CreateOptions{})
sm, err = c.promClient.MonitoringV1().ServiceMonitors(cav.Namespace).Create(ctx, newServiceMonitor(ca, cav, &wl, wlPortInfos), metav1.CreateOptions{})
if err == nil {
util.LogInfo("ServiceMonitor created successfully", string(Processing), cav, sm, "version", cav.Spec.Version)
util.LogInfo("Service monitor created successfully", string(Processing), cav, sm, "version", cav.Spec.Version)
}
}
}
Expand All @@ -517,7 +516,7 @@ func (c *Controller) updateServiceMonitors(ctx context.Context, ca *v1alpha1.CAP
func newServiceMonitor(ca *v1alpha1.CAPApplication, cav *v1alpha1.CAPApplicationVersion, wl *v1alpha1.WorkloadDetails, wlPortInfos *servicePortInfo) *monv1.ServiceMonitor {
config := wl.DeploymentDefinition.Monitoring.ScrapeConfig
return &monv1.ServiceMonitor{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: wlPortInfos.WorkloadName + ServiceSuffix,
Namespace: cav.Namespace,
Labels: copyMaps(wl.Labels, getLabels(ca, cav, CategoryServiceMonitor, string(wl.DeploymentDefinition.Type), wlPortInfos.WorkloadName+ServiceSuffix, true)),
Expand All @@ -533,7 +532,7 @@ func newServiceMonitor(ca *v1alpha1.CAPApplication, cav *v1alpha1.CAPApplication
ScrapeTimeout: monv1.Duration(config.Timeout),
Path: config.Path,
}},
Selector: v1.LabelSelector{
Selector: metav1.LabelSelector{
MatchLabels: copyMaps(wl.Labels, getLabels(ca, cav, CategoryService, wlPortInfos.DeploymentType, wlPortInfos.WorkloadName+ServiceSuffix, false)),
},
},
Expand Down