Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update support diagnostics to 8.5.0 #196

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Update support diagnostics to 8.5.0 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Usage:
eck-diagnostics [flags]

Flags:
--diagnostic-image string Diagnostic image to be used for stack diagnostics, see run-stack-diagnostics (default "docker.elastic.co/eck-dev/support-diagnostics:8.4.3")
--diagnostic-image string Diagnostic image to be used for stack diagnostics, see run-stack-diagnostics (default "docker.elastic.co/eck-dev/support-diagnostics:8.5.0")
--eck-version string ECK version in use, will try to autodetect if not specified
-f, --filters strings Comma-separated list of filters in format "type=name". ex: elasticsearch=my-cluster (Supported types [agent apm beat elasticsearch enterprisesearch kibana maps])
-h, --help help for eck-diagnostics
Expand Down Expand Up @@ -125,4 +125,4 @@ The following resources are returned unfiltered:

### Using custom ECK installation methods

If you are using your own installation manifests or Helm chart make sure the metadata on the Pods running the operator matches the metadata used by Elastic's official installation manifests. Specifically ensure that you have a `control-plane: elastic-operator` label on the ECK operator StatefulSet or Deployment and its Pods. This ensures that eck-diagnostics can successfully extract logs and version information from those Pods.
If you are using your own installation manifests or Helm chart make sure the metadata on the Pods running the operator matches the metadata used by Elastic's official installation manifests. Specifically ensure that you have a `control-plane: elastic-operator` label on the ECK operator StatefulSet or Deployment and its Pods. This ensures that eck-diagnostics can successfully extract logs and version information from those Pods.
9 changes: 5 additions & 4 deletions internal/stackdiag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ import (
"text/template"
"time"

"github.com/elastic/eck-diagnostics/internal/archive"
"github.com/elastic/eck-diagnostics/internal/extraction"
internal_filters "github.com/elastic/eck-diagnostics/internal/filters"
"github.com/ghodss/yaml"
"golang.org/x/text/cases"
"golang.org/x/text/language"
Expand All @@ -33,10 +30,14 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/kubectl/pkg/util/podutils"
"k8s.io/utils/ptr"

"github.com/elastic/eck-diagnostics/internal/archive"
"github.com/elastic/eck-diagnostics/internal/extraction"
internal_filters "github.com/elastic/eck-diagnostics/internal/filters"
)

const (
DiagnosticImage = "docker.elastic.co/eck-dev/support-diagnostics:8.4.3"
DiagnosticImage = "docker.elastic.co/eck-dev/support-diagnostics:8.5.0"

podOutputDir = "/diagnostic-output"
podMainContainerName = "stack-diagnostics"
Expand Down