merging with main

.github/workflows/add-issues-to-ingest-board.yml

@@ -13,6 +13,9 @@ env:
   AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AEzn4zgEgZSo'
   ELASTIC_AGENT_OPTION_ID: 'c1e1a30a'
 
+permissions:
+  contents: read
+
 jobs:
   add_to_ingest_project:
     runs-on: ubuntu-latest

.go-version

@@ -1 +1 @@
-1.21.5
+1.21.8

.golangci.yml

@@ -87,7 +87,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.5"
+    go: "1.21.8"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -121,15 +121,15 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.5"
+    go: "1.21.8"
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.5"
+    go: "1.21.8"
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.5"
+    go: "1.21.8"
 
   gosec:
     excludes:

CHANGELOG.md

@@ -61,4 +61,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Enhance GenerateHints function to check supported list of hints for multiple datastreams and metricsets
 
 
-[0.6.10]: https://github.com/elastic/elastic-agent-autodiscover/compare/v0.6.8...v0.6.9
+[0.6.10]: https://github.com/elastic/elastic-agent-autodiscover/compare/v0.6.8...v0.6.9

kubernetes/watcher.go

@@ -54,6 +54,9 @@ type Watcher interface {
 	// AddEventHandler add event handlers for corresponding event type watched
 	AddEventHandler(ResourceEventHandler)
 
+	// GetEventHandler returns the event handlers for corresponding event type watched
+	GetEventHandler() ResourceEventHandler
+
 	// Store returns the store object for the watcher
 	Store() cache.Store
 
@@ -181,6 +184,11 @@ func (w *watcher) AddEventHandler(h ResourceEventHandler) {
 	w.handler = h
 }
 
+// GetEventHandler returns the watcher's event handler
+func (w *watcher) GetEventHandler() ResourceEventHandler {
+	return w.handler
+}
+
 // Store returns the store object for the resource that is being watched
 func (w *watcher) Store() cache.Store {
 	return w.store

utils/hints.go

@@ -211,6 +211,7 @@ func GenerateHints(annotations mapstr.M, container, prefix string, allSupportedH
 			datastreamlist := GetHintAsList(entries, logName+"/"+"data_streams", "")
 			metricsetlist := GetHintAsList(entries, "metrics"+"/"+"metricsets", "")
 			for key, rawValue := range entries {
+
 				// If there are top level hints like co.elastic.logs/ then just add the values after the /
 				// Only consider namespaced annotations
 				parts := strings.Split(key, "/")

utils/hints_test.go

@@ -51,7 +51,11 @@ func TestGetProcessors(t *testing.T) {
 
 func TestGenerateHints(t *testing.T) {
 
+<<<<<<< HEAD
 	var allSupportedHints = []string{"enabled", "package", "module", "integration", "data_streams", "metricsets", "host", "period", "timeout", "metrics_path", "username", "password", "stream", "processors", "multiline", "json", "disable"}
+=======
+	var allSupportedHints = []string{"enabled", "module", "integration", "datas_treams", "host", "period", "timeout", "metrics_path", "username", "password", "stream", "processors", "multiline", "json", "disable"}
+>>>>>>> 7490558445cb8d3248462255edc8ac64bc18b8eb
 
 	tests := []struct {
 		name                   string
@@ -285,7 +289,6 @@ func TestGenerateHints(t *testing.T) {
 		}
 
 		generateHints, incorrectHints := GenerateHints(annMap, "foobar", "co.elastic", allSupportedHints)
-		t.Log(incorrectHints)
 		assert.Equal(t, test.expectedIncorrectHints, len(incorrectHints)) // We validate how many incorrect hints are provided per test case.
 		assert.Equal(t, test.result, generateHints)
 	}