Compare commits

..

2 Commits

Author SHA1 Message Date
596046fc50 fix versoin newline 2026-07-07 23:48:20 +02:00
002a390f43 satisfy full linter 2026-07-07 23:45:14 +02:00
6 changed files with 9 additions and 54 deletions

View File

@@ -75,10 +75,10 @@ func IndexList(conf *cfg.Config) *cli.Command {
Aliases: []string{"H"}, Aliases: []string{"H"},
}, },
&cli.BoolFlag{ &cli.BoolFlag{
Name: "failed", Name: "reds",
Usage: "include only red failed indicies", Usage: "include only red failed indicies",
Destination: &conf.Failed, Destination: &conf.Failed,
Aliases: []string{"f"}, Aliases: []string{"r"},
}, },
&cli.StringSliceFlag{ &cli.StringSliceFlag{
Name: "filter", Name: "filter",

2
go.mod
View File

@@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
module codeberg.org/scip/esctl module codeberg.org/scip/esctl
go 1.26 go 1.26.4
require ( require (
github.com/MichaelMure/go-term-markdown v0.1.4 github.com/MichaelMure/go-term-markdown v0.1.4

View File

@@ -189,7 +189,6 @@ func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
cluster.getTransport(), cluster.getTransport(),
elastictransport.WithHeader(headers), elastictransport.WithHeader(headers),
), ),
elasticsearch.WithCompatibilityMode(),
} }
} }
@@ -204,9 +203,7 @@ func (cluster *Cluster) getTransport() elastictransport.Option {
) )
} }
return elastictransport.WithTransport( return elastictransport.WithTransport(transport)
&CompatibilityTransport{Transport: transport},
)
} }
func (conf *Config) SetupES() error { func (conf *Config) SetupES() error {

View File

@@ -82,9 +82,8 @@ type Config struct {
SortBy string // sort: -k SortBy string // sort: -k
Ascending bool // sort: -a Ascending bool // sort: -a
All bool // doc + node ls: -a
Exclude string // cluster compare: -e (regexp) Exclude string // cluster compare: -e (regexp)
Verbose bool // cluster status: -v All, Verbose bool // cluster status: -a -v
Persistent, Transient, Default bool // cluster settings set: -p -t -D Persistent, Transient, Default bool // cluster settings set: -p -t -D
Force bool // ccr follower renew: -f Force bool // ccr follower renew: -f

View File

@@ -53,8 +53,6 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
contentline = buf.String() contentline = buf.String()
} }
req = fixRequestHeaders(req)
slog.Info("req", "host", req.URL.Host, "uri", req.URL.Path, slog.Info("req", "host", req.URL.Host, "uri", req.URL.Path,
"body", content, "bodyline", contentline, "body", content, "bodyline", contentline,
"headers", req.Header, "headers", req.Header,
@@ -62,32 +60,3 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
return t.Transport.RoundTrip(req) return t.Transport.RoundTrip(req)
} }
type CompatibilityTransport struct {
Transport http.RoundTripper
}
func (t *CompatibilityTransport) RoundTrip(req *http.Request) (*http.Response, error) {
req = fixRequestHeaders(req)
return t.Transport.RoundTrip(req)
}
// Fixes https://codeberg.org/scip/esctl/issues/79:
// the API client has this Accept header hardcoded everywhere:
// req.Header.Set("Accept", "application/vnd.elasticsearch+json;compatible-with=9")
// While this works pretty well with ES9, it doesn't with ES8. So, we replace
// this header with a new one without the compatibility part.
func fixRequestHeaders(req *http.Request) *http.Request {
if req.Header.Get("Accept") != "" {
req.Header.Del("Accept")
req.Header.Add("Accept", "application/json")
}
if req.Header.Get("Content-Type") != "" {
req.Header.Del("Content-Type")
req.Header.Add("Content-Type", "application/json")
}
return req
}

View File

@@ -174,16 +174,11 @@ func ClusterStatus(conf *cfg.Config) error {
} }
// look for red indices, if any // look for red indices, if any
failedIndices := 0 redindices := 0
greenIndices := 0
for _, index := range *res.indices { for _, index := range *res.indices {
switch { if *index.Health == "red" {
case *index.Health != "green": redindices++
failedIndices++
case !strings.HasPrefix(*index.Index, "."):
// don't count internal indices
greenIndices++
} }
} }
@@ -210,8 +205,7 @@ func ClusterStatus(conf *cfg.Config) error {
{"Unassigned Primary Shards", res.health.UnassignedPrimaryShards}, {"Unassigned Primary Shards", res.health.UnassignedPrimaryShards},
{"Pending Tasks", res.health.NumberOfPendingTasks}, {"Pending Tasks", res.health.NumberOfPendingTasks},
{"Nodes", res.health.NumberOfNodes}, {"Nodes", res.health.NumberOfNodes},
{"Green Indices", greenIndices}, {"Red Indices", redindices},
{"Failed Indices", failedIndices},
{"Long Running Tasks", longtasks}, {"Long Running Tasks", longtasks},
} }
@@ -239,10 +233,6 @@ func ClusterStatus(conf *cfg.Config) error {
for resource, items := range diag.AffectedResources { for resource, items := range diag.AffectedResources {
table.Entries = append(table.Entries, []any{" -> affected " + resource, strings.Join(items, ",")}) table.Entries = append(table.Entries, []any{" -> affected " + resource, strings.Join(items, ",")})
} }
if diag.Action != "" {
table.AddRow(" -> suggested action to fix", diag.Action)
}
} }
} }
} }