-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
[Elasticsearch-xpack] [Metricbeat] Fix elasticsearch-xpack error when Machine Learning is explicitly disabled #39990
Merged
klacabane
merged 6 commits into
elastic:main
from
jennypavlova:28087-fix-error-when-machine-learning-is-explicitly-disabled
Jul 9, 2024
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0f0a31e
Fix metricbeat monitoring module elasticsearch-xpack error when Machi…
jennypavlova f90fda6
CR changes
jennypavlova 0f60b24
formatting changes
jennypavlova 099b38c
Fix test
jennypavlova 28e8b4f
Merge branch 'main' into 28087-fix-error-when-machine-learning-is-exp…
jennypavlova 235d8bb
Merge branch 'main' into 28087-fix-error-when-machine-learning-is-exp…
klacabane File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
// Licensed to Elasticsearch B.V. under one or more contributor | ||
// license agreements. See the NOTICE file distributed with | ||
// this work for additional information regarding copyright | ||
// ownership. Elasticsearch B.V. licenses this file to you under | ||
// the Apache License, Version 2.0 (the "License"); you may | ||
// not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
package ml_job | ||
|
||
import ( | ||
"io/ioutil" | ||
Check failure on line 21 in metricbeat/module/elasticsearch/ml_job/ml_job_test.go GitHub Actions / lint (windows)
|
||
"net/http" | ||
"net/http/httptest" | ||
"strconv" | ||
"strings" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
|
||
"github.com/elastic/beats/v7/metricbeat/module/elasticsearch" | ||
|
||
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" | ||
) | ||
|
||
func createEsMuxer(mlEnabled bool) *http.ServeMux { | ||
license := "platinum" | ||
nodesLocalHandler := func(w http.ResponseWriter, r *http.Request) { | ||
w.Write([]byte(`{"nodes": { "foobar": {}}}`)) | ||
} | ||
clusterStateMasterHandler := func(w http.ResponseWriter, r *http.Request) { | ||
w.Write([]byte(`{"master_node": "foobar"}`)) | ||
} | ||
rootHandler := func(w http.ResponseWriter, r *http.Request) { | ||
if r.URL.Path != "/" { | ||
http.NotFound(w, r) | ||
} | ||
|
||
input, _ := ioutil.ReadFile("./_meta/test/root.710.json") | ||
input = []byte(strings.Replace(string(input), "7.10.0", "7.10.0", -1)) | ||
w.Write(input) | ||
} | ||
licenseHandler := func(w http.ResponseWriter, r *http.Request) { | ||
w.Write([]byte(`{ "license": { "type": "` + license + `" } }`)) | ||
} | ||
xpackHandler := func(w http.ResponseWriter, r *http.Request) { | ||
w.Write([]byte(`{ "features": { "ml": { "enabled": ` + strconv.FormatBool(mlEnabled) + `}}, "ccr": { "enabled": ` + strconv.FormatBool(true) + `}}`)) | ||
} | ||
|
||
mux := http.NewServeMux() | ||
mux.Handle("/_nodes/_local/nodes", http.HandlerFunc(nodesLocalHandler)) | ||
mux.Handle("/_cluster/state/master_node", http.HandlerFunc(clusterStateMasterHandler)) | ||
mux.Handle("/", http.HandlerFunc(rootHandler)) | ||
mux.Handle("/_license", http.HandlerFunc(licenseHandler)) // for 7.0 and above | ||
mux.Handle("/_xpack/license", http.HandlerFunc(licenseHandler)) // for before 7.0 | ||
mux.Handle("/_xpack", http.HandlerFunc(xpackHandler)) | ||
if mlEnabled { | ||
// Should call the API | ||
mux.Handle("/_ml/anomaly_detectors/_all/_stats", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
w.Write([]byte(`{}`)) | ||
})) | ||
} | ||
|
||
return mux | ||
} | ||
|
||
func TestMLNotAvailable(t *testing.T) { | ||
tests := map[string]struct { | ||
mlEnabled bool | ||
}{ | ||
"feature_available": { | ||
true, | ||
}, | ||
"feature_unavailable": { | ||
false, | ||
}, | ||
} | ||
|
||
for name, test := range tests { | ||
t.Run(name, func(t *testing.T) { | ||
mux := createEsMuxer(test.mlEnabled) | ||
if !test.mlEnabled { | ||
mux.Handle("/_ml/anomaly_detectors/_all/_stats", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
http.Error(w, "this should never have been called", http.StatusTeapot) | ||
})) | ||
} | ||
|
||
server := httptest.NewServer(mux) | ||
defer server.Close() | ||
|
||
ms := mbtest.NewReportingMetricSetV2Error(t, getConfig(server.URL)) | ||
events, errs := mbtest.ReportingFetchV2Error(ms) | ||
|
||
require.Empty(t, errs) | ||
require.Empty(t, events) | ||
}) | ||
} | ||
} | ||
|
||
func getConfig(host string) map[string]interface{} { | ||
return map[string]interface{}{ | ||
"module": elasticsearch.ModuleName, | ||
"metricsets": []string{"ml_job"}, | ||
"hosts": []string{host}, | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure why I see these errors - the same import exists in other files 🤔