Release 6.1.0.rc

.gitignore

@@ -1,4 +1,4 @@
-build/*
+build
 coverage.txt
 coverage.html
 pkg/mocks
@@ -7,4 +7,4 @@ pkg/mocks
 argus.rc
 localrun.logs
 scripts/ds/*_gen.xml
-venv
+venv

.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:

cmd/watch.go

@@ -100,6 +100,9 @@ var watchCmd = &cobra.Command{ // nolint: exhaustivestruct
 			return
 		}
 
+		userAgent := constants.UserAgentBase + constants.Version
+		lmClient.LM.SetUserAgent(&userAgent)
+
 		if util.IsLocal() {
 			logrus.SetFormatter(&logrus.TextFormatter{ // nolint: exhaustivestruct
 				ForceColors: false,

go.mod

@@ -9,8 +9,8 @@ require (
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/go-openapi/runtime v0.19.28
-	github.com/go-openapi/strfmt v0.20.1
+	github.com/go-openapi/runtime v0.19.31
+	github.com/go-openapi/strfmt v0.20.2
 	github.com/golang/mock v1.4.4
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/google/go-cmp v0.5.4
@@ -23,10 +23,11 @@ require (
 	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/logicmonitor/k8s-collectorset-controller v2.0.0+incompatible
-	github.com/logicmonitor/lm-sdk-go v2.0.0-argus5+incompatible
+	github.com/logicmonitor/lm-sdk-go v1.0.0-argus1
 	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
@@ -37,7 +38,6 @@ require (
 	go.uber.org/zap v1.17.0 // indirect
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 	google.golang.org/grpc v1.29.1
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	k8s.io/api v0.17.0
 	k8s.io/apimachinery v0.17.0

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"`
@@ -225,7 +225,21 @@ func postProcess(uconf *Config) {
 	}
 }
 
+func ResourceContains(arr []enums.ResourceType, rt enums.ResourceType) bool {
+	for _, v := range arr {
+		if v == rt {
+			return true
+		}
+	}
+	return false
+}
+
 func postLoad(pconf *Config, uconf *Config) {
+	// Disabling Discovery for ConfigMaps for now
+	if !ResourceContains(uconf.DisableResourceMonitoring, enums.ConfigMaps) {
+		logrus.Debugln("Adding ConfigMaps into DisabledResourceMonitoring")
+		uconf.DisableResourceMonitoring = append(uconf.DisableResourceMonitoring, enums.ConfigMaps)
+	}
 	t := reflect.TypeOf(pconf).Elem()
 	v := reflect.ValueOf(pconf).Elem()
 	nv := reflect.ValueOf(uconf).Elem()
@@ -282,9 +296,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/constants/constants.go

@@ -48,6 +48,8 @@ const (
 	NodeResourceGroupName = "Nodes"
 	// NamespacesGroupName is the namespaces resource group name in the cluster resource group.
 	NamespacesGroupName = "Namespaces"
+	// ClusterScopedGroupName is the resource group name for Cluster Scoped Resources in the cluster resource group.
+	ClusterScopedGroupName = "ClusterScoped"
 )
 
 const (
@@ -90,6 +92,16 @@ const (
 	K8sAPIVersionAppsV1 = "apps/v1"
 	// K8sAutoscalingV1 is the version 'autoscaling/v1' of k8s api
 	K8sAutoscalingV1 = "autoscaling/v1"
+	// K8sAPIVersionBatchV1 is the version 'batch/v1' of k8s api
+	K8sAPIVersionBatchV1 = "batch/v1"
+	// K8sAPIVersionBatchV1Beta1 is the version 'batch/v1beta1' of k8s api
+	K8sAPIVersionBatchV1Beta1 = "batch/v1beta1"
+	// K8sAPIVersionExtensionsV1Beta1 is the version 'extensions/v1beta1' of k8s api
+	K8sAPIVersionExtensionsV1Beta1 = "extensions/v1beta1"
+	// K8sAPIVersionNetworkingV1 is the version 'networking/v1' of k8s api
+	K8sAPIVersionNetworkingV1 = "networking/v1"
+	// K8sAPIVersionNetworkingV1Beta1 is the version 'networking/v1beta1' of k8s api
+	K8sAPIVersionNetworkingV1Beta1 = "networking/v1beta1"
 )
 
 const (

pkg/enums/enum_template.tmpl

@@ -5,13 +5,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/logicmonitor/k8s-argus/pkg/constants"
-	appsv1 "k8s.io/api/apps/v1"
-	autoscalingv1 "k8s.io/api/autoscaling/v1"
-	corev1 "k8s.io/api/core/v1"
+	{{- range $value := .Resources.Apis}}{{- if ne $value.Alias "" }}
+	{{ $value.Alias }} "{{ $value.PackageName }}"
+	{{- end}}{{- end }}
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
+{{- $resources := .Resources.Resources }}
+{{ $apis := .Resources.Apis }}
 // ResourceType resource
 type ResourceType uint32
 
@@ -41,7 +42,6 @@ func (resourceType ResourceType) MarshalText() ([]byte, error) {
 	switch resourceType {
 	{{- range $value := .Resources.Resources }}
 	case {{ $value.LongName }}:
-
 		return []byte("{{ $value.LowerCase }}"), nil
 	{{- end }}
 	}
@@ -54,7 +54,7 @@ func ParseResourceType(resourceType string) (ResourceType, error) {
 	{{- range $value := .Resources.Resources }}{{ $length := len $value.ParsedResourceType }}{{ if last $length -1}}
 	case {{ range $i, $v := $value.ParsedResourceType }}"{{$v}}"{{ if last $length $i}}, {{ end}}{{ end }}:
 		return {{$value.LongName}}, nil
-	{{ end }}
+	{{- end }}
 	{{- end }}
 	}
 
@@ -66,7 +66,6 @@ func (resourceType ShortResourceType) MarshalText() ([]byte, error) {
 	switch ResourceType(resourceType) {
 	{{- range $value := .Resources.Resources }}
 	case {{ $value.LongName}}:
-
 		return []byte("{{ (index $value.ShortName 0) }}"), nil
 	{{- end}}
 	}
@@ -81,7 +80,7 @@ func ParseShortResourceType(shortResourceType string) (ShortResourceType, error)
 	{{- range $value := .Resources.Resources }}{{ $length := len $value.ShortName }}{{ if last $length -1}}
 	case {{ range $i, $v := $value.ShortName }}"{{$v}}"{{ if last $length $i}}, {{ end}}{{ end }}:
 		l = {{ $value.LongName}}
-	{{end}}
+	{{- end}}
 	{{- end}}
 	default:
 
@@ -96,21 +95,31 @@ func (resourceType *ResourceType) Title() string {
 	switch *resourceType {
 	{{- range $value := .Resources.Resources }}
 	case {{ $value.LongName }}:
-
 		return "{{ $value.DisplayName}}"
 	{{- end}}
 	}
 
 	return "Unknown"
 }
 
+// nolint: clyclop
+func (resourceType *ResourceType) TitlePlural() string {
+	switch *resourceType {
+	{{- range $value := .Resources.Resources }}
+	case {{ $value.LongName }}:
+		return "{{- titlePlural $value }}"
+	{{- end}}
+	}
+
+	return "Unknown"
+}
+
 // nolint: clyclop
 func (resourceType *ResourceType) K8SObjectType() runtime.Object {
 	switch *resourceType {
 	{{- range $value := .Resources.Resources }}{{ if notNil $value.Apis }}
 	case {{ $value.LongName }}:
-
-		return &{{ $value.Apis }}.{{ $value.DisplayName }}{} // nolint: exhaustivestruct{{ end }}{{- end}}
+		return &{{ $value.Apis }}.{{ k8sObjectType $value }}{} // nolint: exhaustivestruct{{ end }}{{- end}}
 	case {{ getCases .Resources.Resources }}:
 		return nil
 	default:
@@ -122,23 +131,11 @@ func (resourceType *ResourceType) K8SObjectType() runtime.Object {
 // nolint: clyclop
 func (resourceType *ResourceType) K8SAPIVersion() string {
 	switch *resourceType {
-	// core v1 version
-	case Pods, Services, Nodes, Namespaces:
-
-		return constants.K8sAPIVersionV1
-	// apps api group apps/v1 version
-	case Deployments, DaemonSets, ReplicaSets, StatefulSets:
-
-		return constants.K8sAPIVersionAppsV1
-	// autoscaling api group v1 version
-	case Hpas:
-
-		return constants.K8sAutoscalingV1
-	case ETCD, Unknown:
-
-		return ""
+	{{- range $value := $apis }}
+	case {{ apiVersion $resources $value}}:
+		return "{{ api $value }}"
+	{{- end }}
 	default:
-
 		return ""
 	}
 }
@@ -156,23 +153,12 @@ func (resourceType *ResourceType) IsNamespaceScopedResource() bool {
 
 func (resourceType *ResourceType) APIGroup() string {
 	switch *resourceType {
-	// core v1 version
-	case Pods, Services, Nodes, Namespaces:
-
-		return ""
-	// apps api group apps/v1 version
-	case Deployments, DaemonSets, ReplicaSets, StatefulSets:
-
-		return "apps"
-	// autoscaling api group v1 version
-	case Hpas:
-
-		return "autoscaling"
-	case ETCD, Unknown:
-
-		return ""
+	{{- $apiGroups := getApiGroups .Resources.Apis }}
+	{{- range $value := $apiGroups }}
+	case {{ apiGroup $resources $apis $value }}:
+		return "{{- apiGroupValue $value }}"
+	{{- end }}
 	default:
-
 		return ""
 	}
 }