mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Remove unused elasticsearch tests
This commit is contained in:
Elana Hashman
parent
89db31aade
commit
ac5ba850c1
@ -1,62 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2017 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed 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 elasticsearch
|
|
||||||
|
|
||||||
import (
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
|
||||||
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
|
||||||
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
|
|
||||||
"k8s.io/kubernetes/test/e2e/instrumentation/logging/utils"
|
|
||||||
|
|
||||||
"github.com/onsi/ginkgo"
|
|
||||||
)
|
|
||||||
|
|
||||||
var _ = instrumentation.SIGDescribe("Cluster level logging using Elasticsearch [Feature:Elasticsearch]", func() {
|
|
||||||
f := framework.NewDefaultFramework("es-logging")
|
|
||||||
|
|
||||||
ginkgo.BeforeEach(func() {
|
|
||||||
// TODO: For now assume we are only testing cluster logging with Elasticsearch
|
|
||||||
// on GCE. Once we are sure that Elasticsearch cluster level logging
|
|
||||||
// works for other providers we should widen this scope of this test.
|
|
||||||
e2eskipper.SkipUnlessProviderIs("gce")
|
|
||||||
})
|
|
||||||
|
|
||||||
ginkgo.It("should check that logs from containers are ingested into Elasticsearch", func() {
|
|
||||||
ingestionInterval := 10 * time.Second
|
|
||||||
ingestionTimeout := 10 * time.Minute
|
|
||||||
|
|
||||||
p, err := newEsLogProvider(f)
|
|
||||||
framework.ExpectNoError(err, "Failed to create Elasticsearch logs provider")
|
|
||||||
|
|
||||||
err = p.Init()
|
|
||||||
defer p.Cleanup()
|
|
||||||
framework.ExpectNoError(err, "Failed to init Elasticsearch logs provider")
|
|
||||||
|
|
||||||
err = utils.EnsureLoggingAgentDeployment(f, p.LoggingAgentName())
|
|
||||||
framework.ExpectNoError(err, "Fluentd deployed incorrectly")
|
|
||||||
|
|
||||||
pod, err := utils.StartAndReturnSelf(utils.NewRepeatingLoggingPod("synthlogger", "test"), f)
|
|
||||||
framework.ExpectNoError(err, "Failed to start a pod")
|
|
||||||
|
|
||||||
ginkgo.By("Waiting for logs to ingest")
|
|
||||||
c := utils.NewLogChecker(p, utils.UntilFirstEntry, utils.JustTimeout, pod.Name())
|
|
||||||
err = utils.WaitForLogs(c, ingestionInterval, ingestionTimeout)
|
|
||||||
framework.ExpectNoError(err)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@ -1,106 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2017 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed 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 elasticsearch
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
||||||
"k8s.io/apimachinery/pkg/labels"
|
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
|
||||||
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
|
|
||||||
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
|
|
||||||
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
|
||||||
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
|
|
||||||
|
|
||||||
"github.com/onsi/ginkgo"
|
|
||||||
)
|
|
||||||
|
|
||||||
var _ = instrumentation.SIGDescribe("Kibana Logging Instances Is Alive [Feature:Elasticsearch]", func() {
|
|
||||||
f := framework.NewDefaultFramework("kibana-logging")
|
|
||||||
|
|
||||||
ginkgo.BeforeEach(func() {
|
|
||||||
// TODO: For now assume we are only testing cluster logging with Elasticsearch
|
|
||||||
// and Kibana on GCE. Once we are sure that Elasticsearch and Kibana cluster level logging
|
|
||||||
// works for other providers we should widen this scope of this test.
|
|
||||||
e2eskipper.SkipUnlessProviderIs("gce")
|
|
||||||
})
|
|
||||||
|
|
||||||
ginkgo.It("should check that the Kibana logging instance is alive", func() {
|
|
||||||
ClusterLevelLoggingWithKibana(f)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
const (
|
|
||||||
kibanaKey = "k8s-app"
|
|
||||||
kibanaValue = "kibana-logging"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ClusterLevelLoggingWithKibana is an end to end test that checks to see if Kibana is alive.
|
|
||||||
func ClusterLevelLoggingWithKibana(f *framework.Framework) {
|
|
||||||
const pollingInterval = 10 * time.Second
|
|
||||||
const pollingTimeout = 20 * time.Minute
|
|
||||||
|
|
||||||
// Check for the existence of the Kibana service.
|
|
||||||
ginkgo.By("Checking the Kibana service exists.")
|
|
||||||
s := f.ClientSet.CoreV1().Services(metav1.NamespaceSystem)
|
|
||||||
// Make a few attempts to connect. This makes the test robust against
|
|
||||||
// being run as the first e2e test just after the e2e cluster has been created.
|
|
||||||
err := wait.Poll(pollingInterval, pollingTimeout, func() (bool, error) {
|
|
||||||
if _, err := s.Get(context.TODO(), "kibana-logging", metav1.GetOptions{}); err != nil {
|
|
||||||
framework.Logf("Kibana is unreachable: %v", err)
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
return true, nil
|
|
||||||
})
|
|
||||||
framework.ExpectNoError(err)
|
|
||||||
|
|
||||||
// Wait for the Kibana pod(s) to enter the running state.
|
|
||||||
ginkgo.By("Checking to make sure the Kibana pods are running")
|
|
||||||
label := labels.SelectorFromSet(labels.Set(map[string]string{kibanaKey: kibanaValue}))
|
|
||||||
options := metav1.ListOptions{LabelSelector: label.String()}
|
|
||||||
pods, err := f.ClientSet.CoreV1().Pods(metav1.NamespaceSystem).List(context.TODO(), options)
|
|
||||||
framework.ExpectNoError(err)
|
|
||||||
for _, pod := range pods.Items {
|
|
||||||
err = e2epod.WaitForPodRunningInNamespace(f.ClientSet, &pod)
|
|
||||||
framework.ExpectNoError(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
ginkgo.By("Checking to make sure we get a response from the Kibana UI.")
|
|
||||||
err = wait.Poll(pollingInterval, pollingTimeout, func() (bool, error) {
|
|
||||||
req, err := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
|
|
||||||
if err != nil {
|
|
||||||
framework.Logf("Failed to get services proxy request: %v", err)
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), framework.SingleCallTimeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
_, err = req.Namespace(metav1.NamespaceSystem).
|
|
||||||
Name("kibana-logging").
|
|
||||||
DoRaw(ctx)
|
|
||||||
if err != nil {
|
|
||||||
framework.Logf("Proxy call to kibana-logging failed: %v", err)
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
return true, nil
|
|
||||||
})
|
|
||||||
framework.ExpectNoError(err)
|
|
||||||
}
|
|
||||||
@ -1,254 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2017 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed 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 elasticsearch
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"strconv"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
||||||
"k8s.io/apimachinery/pkg/fields"
|
|
||||||
api "k8s.io/kubernetes/pkg/apis/core"
|
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
|
||||||
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
|
|
||||||
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
|
|
||||||
"k8s.io/kubernetes/test/e2e/instrumentation/logging/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
// esRetryTimeout is how long to keep retrying requesting elasticsearch for status information.
|
|
||||||
esRetryTimeout = 5 * time.Minute
|
|
||||||
|
|
||||||
// esRetryDelay is how much time to wait between two attempts to send a request to elasticsearch
|
|
||||||
esRetryDelay = 5 * time.Second
|
|
||||||
|
|
||||||
// searchPageSize is how many entries to search for in Elasticsearch.
|
|
||||||
searchPageSize = 1000
|
|
||||||
)
|
|
||||||
|
|
||||||
var _ utils.LogProvider = &esLogProvider{}
|
|
||||||
|
|
||||||
type esLogProvider struct {
|
|
||||||
Framework *framework.Framework
|
|
||||||
}
|
|
||||||
|
|
||||||
func newEsLogProvider(f *framework.Framework) (*esLogProvider, error) {
|
|
||||||
return &esLogProvider{Framework: f}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ensures that elasticsearch is running and ready to serve requests
|
|
||||||
func (p *esLogProvider) Init() error {
|
|
||||||
f := p.Framework
|
|
||||||
// Check for the existence of the Elasticsearch service.
|
|
||||||
framework.Logf("Checking the Elasticsearch service exists.")
|
|
||||||
s := f.ClientSet.CoreV1().Services(api.NamespaceSystem)
|
|
||||||
// Make a few attempts to connect. This makes the test robust against
|
|
||||||
// being run as the first e2e test just after the e2e cluster has been created.
|
|
||||||
var err error
|
|
||||||
for start := time.Now(); time.Since(start) < esRetryTimeout; time.Sleep(esRetryDelay) {
|
|
||||||
if _, err = s.Get(context.TODO(), "elasticsearch-logging", meta_v1.GetOptions{}); err == nil {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
framework.Logf("Attempt to check for the existence of the Elasticsearch service failed after %v", time.Since(start))
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wait for the Elasticsearch pods to enter the running state.
|
|
||||||
framework.Logf("Checking to make sure the Elasticsearch pods are running")
|
|
||||||
labelSelector := fields.SelectorFromSet(fields.Set(map[string]string{"k8s-app": "elasticsearch-logging"})).String()
|
|
||||||
options := meta_v1.ListOptions{LabelSelector: labelSelector}
|
|
||||||
pods, err := f.ClientSet.CoreV1().Pods(api.NamespaceSystem).List(context.TODO(), options)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for _, pod := range pods.Items {
|
|
||||||
err = e2epod.WaitForPodRunningInNamespace(f.ClientSet, &pod)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
framework.Logf("Checking to make sure we are talking to an Elasticsearch service.")
|
|
||||||
// Perform a few checks to make sure this looks like an Elasticsearch cluster.
|
|
||||||
var statusCode int
|
|
||||||
err = nil
|
|
||||||
var body []byte
|
|
||||||
for start := time.Now(); time.Since(start) < esRetryTimeout; time.Sleep(esRetryDelay) {
|
|
||||||
proxyRequest, errProxy := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
|
|
||||||
if errProxy != nil {
|
|
||||||
framework.Logf("After %v failed to get services proxy request: %v", time.Since(start), errProxy)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// Query against the root URL for Elasticsearch.
|
|
||||||
response := proxyRequest.Namespace(api.NamespaceSystem).
|
|
||||||
Name("elasticsearch-logging").
|
|
||||||
Do(context.TODO())
|
|
||||||
err = response.Error()
|
|
||||||
response.StatusCode(&statusCode)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
framework.Logf("After %v proxy call to elasticsearch-loigging failed: %v", time.Since(start), err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if int(statusCode) != 200 {
|
|
||||||
framework.Logf("After %v Elasticsearch cluster has a bad status: %v", time.Since(start), statusCode)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if int(statusCode) != 200 {
|
|
||||||
framework.Failf("Elasticsearch cluster has a bad status: %v", statusCode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now assume we really are talking to an Elasticsearch instance.
|
|
||||||
// Check the cluster health.
|
|
||||||
framework.Logf("Checking health of Elasticsearch service.")
|
|
||||||
healthy := false
|
|
||||||
for start := time.Now(); time.Since(start) < esRetryTimeout; time.Sleep(esRetryDelay) {
|
|
||||||
proxyRequest, errProxy := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
|
|
||||||
if errProxy != nil {
|
|
||||||
framework.Logf("After %v failed to get services proxy request: %v", time.Since(start), errProxy)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
body, err = proxyRequest.Namespace(api.NamespaceSystem).
|
|
||||||
Name("elasticsearch-logging").
|
|
||||||
Suffix("_cluster/health").
|
|
||||||
Param("level", "indices").
|
|
||||||
DoRaw(context.TODO())
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
health := make(map[string]interface{})
|
|
||||||
err := json.Unmarshal(body, &health)
|
|
||||||
if err != nil {
|
|
||||||
framework.Logf("Bad json response from elasticsearch: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
statusIntf, ok := health["status"]
|
|
||||||
if !ok {
|
|
||||||
framework.Logf("No status field found in cluster health response: %v", health)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
status := statusIntf.(string)
|
|
||||||
if status != "green" && status != "yellow" {
|
|
||||||
framework.Logf("Cluster health has bad status: %v", health)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if err == nil && ok {
|
|
||||||
healthy = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !healthy {
|
|
||||||
return fmt.Errorf("after %v elasticsearch cluster is not healthy", esRetryTimeout)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *esLogProvider) Cleanup() {
|
|
||||||
// Nothing to do
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *esLogProvider) ReadEntries(name string) []utils.LogEntry {
|
|
||||||
f := p.Framework
|
|
||||||
|
|
||||||
proxyRequest, errProxy := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
|
|
||||||
if errProxy != nil {
|
|
||||||
framework.Logf("Failed to get services proxy request: %v", errProxy)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
query := fmt.Sprintf("kubernetes.pod_name:%s AND kubernetes.namespace_name:%s", name, f.Namespace.Name)
|
|
||||||
framework.Logf("Sending a search request to Elasticsearch with the following query: %s", query)
|
|
||||||
|
|
||||||
// Ask Elasticsearch to return all the log lines that were tagged with the
|
|
||||||
// pod name. Ask for ten times as many log lines because duplication is possible.
|
|
||||||
body, err := proxyRequest.Namespace(api.NamespaceSystem).
|
|
||||||
Name("elasticsearch-logging").
|
|
||||||
Suffix("_search").
|
|
||||||
Param("q", query).
|
|
||||||
Param("size", strconv.Itoa(searchPageSize)).
|
|
||||||
DoRaw(context.TODO())
|
|
||||||
if err != nil {
|
|
||||||
framework.Logf("Failed to make proxy call to elasticsearch-logging: %v", err)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var response map[string]interface{}
|
|
||||||
err = json.Unmarshal(body, &response)
|
|
||||||
if err != nil {
|
|
||||||
framework.Logf("Failed to unmarshal response: %v", err)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
hits, ok := response["hits"].(map[string]interface{})
|
|
||||||
if !ok {
|
|
||||||
framework.Logf("response[hits] not of the expected type: %T", response["hits"])
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
h, ok := hits["hits"].([]interface{})
|
|
||||||
if !ok {
|
|
||||||
framework.Logf("Hits not of the expected type: %T", hits["hits"])
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
entries := []utils.LogEntry{}
|
|
||||||
// Iterate over the hits and populate the observed array.
|
|
||||||
for _, e := range h {
|
|
||||||
l, ok := e.(map[string]interface{})
|
|
||||||
if !ok {
|
|
||||||
framework.Logf("Element of hit not of expected type: %T", e)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
source, ok := l["_source"].(map[string]interface{})
|
|
||||||
if !ok {
|
|
||||||
framework.Logf("_source not of the expected type: %T", l["_source"])
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
msg, ok := source["log"].(string)
|
|
||||||
if ok {
|
|
||||||
entries = append(entries, utils.LogEntry{TextPayload: msg})
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
obj, ok := source["log"].(map[string]interface{})
|
|
||||||
if ok {
|
|
||||||
entries = append(entries, utils.LogEntry{JSONPayload: obj})
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
framework.Logf("Log is of unknown type, got %v, want string or object in field 'log'", source)
|
|
||||||
}
|
|
||||||
|
|
||||||
return entries
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *esLogProvider) LoggingAgentName() string {
|
|
||||||
return "fluentd-es"
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2017 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed 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 logging
|
|
||||||
|
|
||||||
import (
|
|
||||||
_ "k8s.io/kubernetes/test/e2e/instrumentation/logging/elasticsearch" // for elasticsearch provider
|
|
||||||
)
|
|
||||||
Loading…
Reference in New Issue
Block a user