Merge branch 'main' into DEV-21538-update-kube-state-metrics-v2.8.1

AccessibleAI · Feb 8, 2024 · 838c6d0 · 838c6d0
2 parents a38139a + 0be73e3
commit 838c6d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/api/v1/logging.go b/api/v1/logging.go
@@ -76,7 +76,7 @@ var fluentbitDefault = Fluentbit{
 var cnvrgAppLoggingDefault = CnvrgAppLogging{
 	Elastalert: Elastalert{
 		Enabled:        false,
-		Image:          "elastalert:3.0.0-beta.1",
+		Image:          "elastalert2:server-2.15",
 		CredsRef:       "elastalert-creds",
 		AuthProxyImage: "nginx:1.20",
 		Port:           80,

diff --git a/pkg/desired/kinds.go b/pkg/desired/kinds.go
@@ -172,7 +172,7 @@ var Kinds = map[GVKName]schema.GroupVersionKind{
 	},
 	HpaGVK: schema.GroupVersionKind{
 		Group:   "autoscaling",
-		Version: "v2beta2",
+		Version: "v2",
 		Kind:    "HorizontalPodAutoscaler",
 	},
 	PriorityClassGVK: schema.GroupVersionKind{

diff --git a/pkg/logging/tmpl/elastalert/cm.tpl b/pkg/logging/tmpl/elastalert/cm.tpl
@@ -19,18 +19,6 @@ data:
       "wsport": 3333,
       "elastalertPath": "/opt/elastalert",
       "verbose": true,
-      "use_ssl": false,
-      "verify_certs": false,
-      "run_every": {
-        "minutes": 1
-      },
-      "buffer_time": {
-        "minutes": 15
-      },
-      "alert_time_limit": {
-        "days": 2
-      },
-      "rules_folder": "rules",
       "rulesPath": {
         "relative": true,
         "path": "/rules"
@@ -45,6 +33,8 @@ data:
       },
       "es_host": "{{ .Spec.Dbs.Es.SvcName }}",
       "es_port": {{ .Spec.Dbs.Es.Port }},
+      "es_ssl": false,
+      "ea_verify_certs": false,
       "writeback_index": "elastalert_status"
     }
   config.yaml: |