Release 6.0.7-rc

.golangci.yml

@@ -129,6 +129,7 @@ linters-settings:
         - github.com/logicmonitor/lm-sdk-go
         - github.com/logicmonitor/k8s-collectorset-controller
         - github.com/pkg/profile
+        - github.com/senseyeio/duration
 
     blocked:
       modules:

go.mod

@@ -27,6 +27,7 @@ require (
 	github.com/pkg/profile v1.6.0
 	github.com/prometheus/client_golang v0.9.3
 	github.com/robfig/cron/v3 v3.0.1
+	github.com/senseyeio/duration v0.0.0-20180430131211-7c2a214ada46
 	github.com/sirupsen/logrus v1.4.2
 	github.com/soheilhy/cmux v0.1.5 // indirect
 	github.com/spf13/cobra v0.0.3

go.sum

@@ -384,6 +384,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/senseyeio/duration v0.0.0-20180430131211-7c2a214ada46 h1:Dz0HrI1AtNSGCE8LXLLqoZU4iuOJXPWndenCsZfstA8=
+github.com/senseyeio/duration v0.0.0-20180430131211-7c2a214ada46/go.mod h1:is8FVkzSi7PYLWEXT5MgWhglFsyyiW8ffxAoJqfuFZo=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

main.go

@@ -1,6 +1,8 @@
 package main
 
-import "github.com/logicmonitor/k8s-argus/cmd"
+import (
+	"github.com/logicmonitor/k8s-argus/cmd"
+)
 
 func main() {
 	cmd.Execute()

pkg/config/config.go

@@ -37,7 +37,7 @@ type Config struct {
 	EnableNewResourceTree         bool                    `yaml:"enable_new_resource_tree"`
 	EnableNamespacesDeletedGroups bool                    `yaml:"enable_namespaces_deleted_groups"`
 	RegisterGenericFilter         bool                    `yaml:"register_generic_filter"`
-	DeleteArgusPodAfter           *string                 `yaml:"delete_argus_pod_after"`
+	DeleteInfraPodsAfter          *string                 `yaml:"delete_infra_pods_after"`
 	DisableResourceMonitoring     []enums.ResourceType    `yaml:"disable_resource_monitoring"`
 	DisableResourceAlerting       []enums.ResourceType    `yaml:"disable_resource_alerting"`
 	TelemetryCronString           *string                 `yaml:"telemetry_cron_string"`
@@ -282,9 +282,9 @@ func validateConfig(conf *Config) {
 		defaultQueueSize := 100
 		conf.ParallelRunnerQueueSize = &defaultQueueSize
 	}
-	if conf.DeleteArgusPodAfter == nil {
+	if conf.DeleteInfraPodsAfter == nil {
 		scheduledDeleteTime := "P10DT0H0M0S"
-		conf.DeleteArgusPodAfter = &scheduledDeleteTime
+		conf.DeleteInfraPodsAfter = &scheduledDeleteTime
 	}
 	if conf.TelemetryCronString == nil {
 		// Defaults to 10 minute if not specified

pkg/enums/enums.yaml

@@ -60,6 +60,7 @@ resources:
   - hpa
   longName: Hpas
   lowerCase: horizontalpodautoscalers
+  titlePlural: HorizontalPodAutoscalers
   parsedResourceType:
   - horizontalpodautoscalers
   - horizontalpodautoscaler
@@ -83,7 +84,7 @@ resources:
   shortName:
   - etcd
   longName: ETCD
-  titlePlural: Etcds
+  titlePlural: Etcd
   lowerCase: etcd
   parsedResourceType:
   - etcd

pkg/resource/builder/builder.go

@@ -48,6 +48,13 @@ func (b *Builder) SystemCategory(category string, action enums.BuilderAction) ty
 	return setProperty(constants.K8sSystemCategoriesPropertyKey, category, action)
 }
 
+// DisableResourceAlerting implements types.ResourceBuilder
+func (b *Builder) DisableResourceAlerting(disable bool) types.ResourceOption {
+	return func(device *models.Device) {
+		device.DisableAlerting = disable
+	}
+}
+
 // ResourceAnnotations implements types.ResourceBuilder
 func (b *Builder) ResourceAnnotations(properties map[string]string) types.ResourceOption {
 	return func(resource *models.Device) {
@@ -369,16 +376,20 @@ func (b *Builder) GetMarkDeleteOptions(lctx *lmctx.LMContext, rt enums.ResourceT
 
 	options := []types.ResourceOption{
 		b.SystemCategory(rt.GetDeletedCategory(), enums.Add),
+		b.DisableResourceAlerting(true),
 		b.DeletedOn(meta.DeletionTimestamp.Time),
 		b.ChangePrimaryKeysToMarkDelete(),
 	}
+	if val, ok := meta.Labels["logicmonitor/deleteafterduration"]; ok {
+		options = append(options, b.Custom("kubernetes.resourcedeleteafterduration", val))
+	}
 	// We are not deleting argus pod, as we need argus pod logs for troubleshooting
 	if util.IsArgusPodObject(lctx, rt, meta) {
 		// defaults to 10 days
 		scheduledDeleteTime := "P10DT0H0M0S"
 		conf, err := config.GetConfig(lctx)
 		if err == nil {
-			scheduledDeleteTime = *conf.DeleteArgusPodAfter
+			scheduledDeleteTime = *conf.DeleteInfraPodsAfter
 		}
 		options = append(options, b.Custom("kubernetes.resourcedeleteafterduration", scheduledDeleteTime))
 	}

pkg/resource/watcher.go

@@ -16,6 +16,7 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/types"
 	util "github.com/logicmonitor/k8s-argus/pkg/utilities"
 	"github.com/logicmonitor/lm-sdk-go/models"
+	"github.com/senseyeio/duration"
 )
 
 // AddFunc returns func
@@ -59,7 +60,7 @@ func (m *Manager) UpdateFunc() func(*lmctx.LMContext, enums.ResourceType, interf
 }
 
 // DeleteFunc returns function
-func (m *Manager) DeleteFunc() func(*lmctx.LMContext, enums.ResourceType, interface{}, ...types.ResourceOption) error {
+func (m *Manager) DeleteFunc() func(*lmctx.LMContext, enums.ResourceType, interface{}, ...types.ResourceOption) error { //nolint:cyclop
 	return func(lctx *lmctx.LMContext, rt enums.ResourceType, obj interface{}, options ...types.ResourceOption) error {
 		log := lmlog.Logger(lctx)
 		conf, err := config.GetConfig(lctx)
@@ -71,8 +72,22 @@ func (m *Manager) DeleteFunc() func(*lmctx.LMContext, enums.ResourceType, interf
 		if err != nil {
 			return err
 		}
-		if conf.DeleteResources &&
-			!util.IsArgusPod(lctx, rt, resource) {
+		objMeta, err := rt.ObjectMeta(obj)
+		if err != nil {
+			return err
+		}
+		val, deleteAfterLabelExists := objMeta.Labels["logicmonitor/deleteafterduration"]
+		d := duration.Duration{}
+		if deleteAfterLabelExists {
+			du, err := duration.ParseISO8601(val)
+			if err != nil {
+				deleteAfterLabelExists = false
+			} else {
+				d = du
+			}
+		}
+		if (conf.DeleteResources && !util.IsArgusPod(lctx, rt, resource)) ||
+			(!conf.DeleteResources && deleteAfterLabelExists && d.IsZero()) {
 			err := m.Delete(lctx, rt, obj, options...)
 			if err != nil {
 				if util.GetHTTPStatusCodeFromLMSDKError(err) == http.StatusNotFound {

pkg/sync/initsyncer.go

@@ -20,6 +20,7 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/types"
 	util "github.com/logicmonitor/k8s-argus/pkg/utilities"
 	"github.com/logicmonitor/lm-sdk-go/models"
+	"github.com/senseyeio/duration"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -92,11 +93,13 @@ func (i *InitSyncer) Sync(lctx *lmctx.LMContext) {
 		})
 		childLctx = childLctx.LMContextWith(map[string]interface{}{constants.PartitionKey: fmt.Sprintf("%s-%s", cacheResourceName.Resource.String(), cacheResourceName.Name)})
 
-		if cacheResourceName.Resource == enums.Namespaces && cacheResourceName.Name != constants.DeletedResourceGroup {
-			if err := i.deleteNamespace(allK8SResourcesStore, childLctx, cacheResourceName, cacheResourceMeta, log, conf); err != nil && !errors.Is(err, aerrors.ErrResourceGroupIsNotEmpty) &&
-				!errors.Is(err, aerrors.ErrResourceGroupParentIsNotValid) &&
-				!strings.Contains(err.Error(), util.ClusterGroupName(conf.ClusterName)) {
-				log.Errorf("failed to delete resource group: %s", err)
+		if cacheResourceName.Resource == enums.Namespaces {
+			if cacheResourceName.Name != constants.DeletedResourceGroup {
+				if err := i.deleteNamespace(allK8SResourcesStore, childLctx, cacheResourceName, cacheResourceMeta, log, conf); err != nil && !errors.Is(err, aerrors.ErrResourceGroupIsNotEmpty) &&
+					!errors.Is(err, aerrors.ErrResourceGroupParentIsNotValid) &&
+					!strings.Contains(err.Error(), util.ClusterGroupName(conf.ClusterName)) {
+					log.Errorf("failed to delete resource group: %s", err)
+				}
 			}
 			continue
 		}
@@ -198,15 +201,20 @@ func (i *InitSyncer) resolveConflicts(lctx *lmctx.LMContext, cacheMeta types.Res
 	}
 }
 
-func (i *InitSyncer) deleteResource(lctx *lmctx.LMContext, resourceName types.ResourceName, resourceMeta types.ResourceMeta) {
+func (i *InitSyncer) deleteResource(lctx *lmctx.LMContext, resourceName types.ResourceName, resourceMeta types.ResourceMeta) { //nolint:cyclop
 	log := lmlog.Logger(lctx)
 	conf, err := config.GetConfig(lctx)
 	if err != nil {
 		log.Errorf("Failed to get config")
 		return
 	}
-	if conf.DeleteResources &&
-		!util.IsArgusPodCacheMeta(lctx, resourceName.Resource, resourceMeta) {
+	argusDeleteAfter, err := duration.ParseISO8601(*conf.DeleteInfraPodsAfter)
+	if err != nil {
+		log.Errorf("Failed to parse delete argus after parameter to duration as per ISO 8601 format: %s", err)
+		return
+	}
+	if (conf.DeleteResources && !util.IsArgusPodCacheMeta(lctx, resourceName.Resource, resourceMeta)) ||
+		(util.IsArgusPodCacheMeta(lctx, resourceName.Resource, resourceMeta) && argusDeleteAfter.IsZero() && conf.DeleteResources) {
 		log.Info("Deleting resource")
 		err := i.ResourceManager.DeleteResourceByID(lctx, resourceName.Resource, resourceMeta.LMID)
 		if err != nil {
@@ -223,7 +231,9 @@ func (i *InitSyncer) deleteResource(lctx *lmctx.LMContext, resourceName types.Re
 		}
 	} else if !resourceMeta.HasSysCategory(resourceName.Resource.GetDeletedCategory()) {
 		log.Info("Soft delete")
-		deleteOptions := i.ResourceManager.GetMarkDeleteOptions(lctx, resourceName.Resource, meta.AsPartialObjectMetadata(&metav1.ObjectMeta{}))
+		deleteOptions := i.ResourceManager.GetMarkDeleteOptions(lctx, resourceName.Resource, meta.AsPartialObjectMetadata(&metav1.ObjectMeta{
+			Labels: resourceMeta.Labels,
+		}))
 
 		_, err = i.ResourceManager.UpdateResourceByID(lctx, resourceName.Resource, resourceMeta.LMID, deleteOptions...)
 		if err != nil {

pkg/tree/tree.go

@@ -8,6 +8,7 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/enums"
 	"github.com/logicmonitor/k8s-argus/pkg/lmctx"
 	lmlog "github.com/logicmonitor/k8s-argus/pkg/log"
+	"github.com/logicmonitor/k8s-argus/pkg/permission"
 	"github.com/logicmonitor/k8s-argus/pkg/resourcegroup"
 	"github.com/logicmonitor/k8s-argus/pkg/resourcegroup/dgbuilder"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
@@ -67,6 +68,7 @@ func GetResourceGroupTree(lctx *lmctx.LMContext, dgBuilder types.ResourceManager
 		if !resource.IsNamespaceScopedResource() && resource != nodes && !conf.IsMonitoringDisabled(resource) {
 			treeObj.ChildGroups = append(treeObj.ChildGroups,
 				&types.ResourceGroupTree{
+					DontCreate: !permission.HasPermissions(resource),
 					Options: []types.ResourceGroupOption{
 						dgBuilder.GroupName(resource.TitlePlural()),
 						dgBuilder.DisableAlerting(conf.ShouldDisableAlerting(resource)),
@@ -89,24 +91,25 @@ func GetResourceGroupTree(lctx *lmctx.LMContext, dgBuilder types.ResourceManager
 
 	for _, resource := range enums.ALLResourceTypes {
 		if resource != enums.Namespaces && resource.IsNamespaceScopedResource() && !conf.IsMonitoringDisabled(resource) {
-			treeObj.ChildGroups = append(treeObj.ChildGroups,
-				&types.ResourceGroupTree{
-					Options: []types.ResourceGroupOption{
-						dgBuilder.GroupName(resource.TitlePlural()),
-						dgBuilder.DisableAlerting(conf.ShouldDisableAlerting(resource)),
-						dgBuilder.CustomProperties(dgbuilder.NewPropertyBuilder().AddProperties(conf.ResourceGroupProperties.Get(resource))),
-					},
-					ChildGroups: []*types.ResourceGroupTree{
-						{
-							DontCreate: doNotCreateDeletedGroup,
-							Options: []types.ResourceGroupOption{
-								dgBuilder.GroupName(constants.DeletedResourceGroup),
-								dgBuilder.DisableAlerting(true),
-								dgBuilder.AppliesTo(dgbuilder.NewAppliesToBuilder().HasCategory(resource.GetDeletedCategory()).And().Auto("clustername").Equals(conf.ClusterName)),
-							},
+			resourceTree := &types.ResourceGroupTree{
+				DontCreate: !permission.HasPermissions(resource),
+				Options: []types.ResourceGroupOption{
+					dgBuilder.GroupName(resource.TitlePlural()),
+					dgBuilder.DisableAlerting(conf.ShouldDisableAlerting(resource)),
+					dgBuilder.CustomProperties(dgbuilder.NewPropertyBuilder().AddProperties(conf.ResourceGroupProperties.Get(resource))),
+				},
+				ChildGroups: []*types.ResourceGroupTree{
+					{
+						DontCreate: doNotCreateDeletedGroup && !(resource == enums.Pods),
+						Options: []types.ResourceGroupOption{
+							dgBuilder.GroupName(constants.DeletedResourceGroup),
+							dgBuilder.DisableAlerting(true),
+							dgBuilder.AppliesTo(dgbuilder.NewAppliesToBuilder().HasCategory(resource.GetDeletedCategory()).And().Auto("clustername").Equals(conf.ClusterName)),
 						},
 					},
-				})
+				},
+			}
+			treeObj.ChildGroups = append(treeObj.ChildGroups, resourceTree)
 		}
 	}
 	return treeObj, nil
@@ -131,6 +134,7 @@ func GetResourceGroupTree2(lctx *lmctx.LMContext, dgBuilder types.ResourceManage
 		if !resource.IsNamespaceScopedResource() && resource != enums.Nodes {
 			clusterscoped = append(clusterscoped,
 				&types.ResourceGroupTree{
+					DontCreate: !permission.HasPermissions(resource),
 					Options: []types.ResourceGroupOption{
 						dgBuilder.GroupName(resource.TitlePlural()),
 						dgBuilder.DisableAlerting(conf.ShouldDisableAlerting(resource)),

pkg/types/types.go

@@ -163,6 +163,10 @@ type ResourceBuilder interface {
 	// DeletedOn adds kubernetes.resourceDeletedOn property to the resource.
 	DeletedOn(time.Time) ResourceOption
 
+	// DisableResourceAlerting disable alerting
+	DisableResourceAlerting(bool) ResourceOption
+
+	// GetMarkDeleteOptions get deleted options
 	GetMarkDeleteOptions(*lmctx.LMContext, enums.ResourceType, *metav1.PartialObjectMetadata) []ResourceOption
 }