mirror of
https://codeberg.org/scip/esctl.git
synced 2026-08-24 04:54:18 +02:00
add search validate+explain (#31)
This commit is contained in:
27
TODO.md
27
TODO.md
@@ -1,40 +1,13 @@
|
|||||||
- [Go client docs](https://www.elastic.co/docs/reference/elasticsearch/clients/go/typed-api)
|
- [Go client docs](https://www.elastic.co/docs/reference/elasticsearch/clients/go/typed-api)
|
||||||
- [ES API docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get)
|
- [ES API docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get)
|
||||||
|
|
||||||
- Fix index names custom completion
|
|
||||||
https://github.com/urfave/cli/issues/2332
|
|
||||||
https://github.com/urfave/cli/issues/2333
|
|
||||||
|
|
||||||
- index show: add more details, see screenshots
|
- index show: add more details, see screenshots
|
||||||
|
|
||||||
- add shard explain, aka:
|
- add shard explain, aka:
|
||||||
get /_cluster/allocation/explain {"index":"yourindex", "primary": true, "shard":0}
|
get /_cluster/allocation/explain {"index":"yourindex", "primary": true, "shard":0}
|
||||||
|
|
||||||
|
|
||||||
- add validate:
|
|
||||||
|
|
||||||
> GET /mock/_validate/query?rewrite=true {"from":0,"query":{"bool":{"must":[{"match_all":{}}]}},"size":20,"sort":[{"name":{"order":"desc"}}]}
|
|
||||||
{
|
|
||||||
"valid": false
|
|
||||||
}
|
|
||||||
|
|
||||||
- add explain to search (maybe option -e)
|
|
||||||
|
|
||||||
> GET /mock/_explain/1780043878 {"query":{"bool":{"must":[{"match_all":{}}]}}}
|
|
||||||
{
|
|
||||||
"_index": "mock",
|
|
||||||
"_id": "1780043878",
|
|
||||||
"matched": true,
|
|
||||||
"explanation": {
|
|
||||||
"value": 1.0,
|
|
||||||
"description": "*:*",
|
|
||||||
"details": []
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- add datastream support:
|
- add datastream support:
|
||||||
https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream
|
https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream
|
||||||
|
|
||||||
also exclude data stream backing indices from index ls
|
also exclude data stream backing indices from index ls
|
||||||
|
|
||||||
- add filter option to index ls (regex), maybe to other ls commands as well, use -F <filter>
|
|
||||||
|
|||||||
@@ -92,10 +92,6 @@ func DocShow(conf *cfg.Config) *cli.Command {
|
|||||||
},
|
},
|
||||||
|
|
||||||
Action: func(ctx context.Context, cmd *cli.Command) error {
|
Action: func(ctx context.Context, cmd *cli.Command) error {
|
||||||
if conf.Subhelp {
|
|
||||||
return showJsonPathHelp()
|
|
||||||
}
|
|
||||||
|
|
||||||
args := cmd.Args()
|
args := cmd.Args()
|
||||||
|
|
||||||
if args.Len() != 1 {
|
if args.Len() != 1 {
|
||||||
@@ -155,10 +151,6 @@ func DocDelete(conf *cfg.Config) *cli.Command {
|
|||||||
},
|
},
|
||||||
|
|
||||||
Action: func(ctx context.Context, cmd *cli.Command) error {
|
Action: func(ctx context.Context, cmd *cli.Command) error {
|
||||||
if conf.Subhelp {
|
|
||||||
return showJsonPathHelp()
|
|
||||||
}
|
|
||||||
|
|
||||||
args := cmd.Args()
|
args := cmd.Args()
|
||||||
|
|
||||||
if args.Len() == 0 && !conf.All {
|
if args.Len() == 0 && !conf.All {
|
||||||
|
|||||||
46
cmd/root.go
46
cmd/root.go
@@ -83,12 +83,6 @@ func Main() int {
|
|||||||
Usage: "output mode (tsv, markdown, json, yaml) default: tsv",
|
Usage: "output mode (tsv, markdown, json, yaml) default: tsv",
|
||||||
Destination: &conf.Output,
|
Destination: &conf.Output,
|
||||||
},
|
},
|
||||||
&cli.BoolFlag{
|
|
||||||
Name: "help-jsonpath",
|
|
||||||
Usage: "show jsonPath help",
|
|
||||||
Destination: &conf.Subhelp,
|
|
||||||
Aliases: []string{"H"},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
Commands: []*cli.Command{
|
Commands: []*cli.Command{
|
||||||
@@ -104,6 +98,7 @@ func Main() int {
|
|||||||
Version(conf),
|
Version(conf),
|
||||||
Debug(conf),
|
Debug(conf),
|
||||||
Roles(conf),
|
Roles(conf),
|
||||||
|
HelpJsonPath(conf),
|
||||||
},
|
},
|
||||||
|
|
||||||
Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
|
Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
|
||||||
@@ -125,6 +120,45 @@ func Main() int {
|
|||||||
return Finish(cmd.Run(context.Background(), os.Args))
|
return Finish(cmd.Run(context.Background(), os.Args))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func HelpJsonPath(conf *cfg.Config) *cli.Command {
|
||||||
|
msg := `jsonPath usage:
|
||||||
|
|
||||||
|
name.last >> "Anderson"
|
||||||
|
age >> 37
|
||||||
|
children >> ["Sara","Alex","Jack"]
|
||||||
|
children.# >> 3
|
||||||
|
children.1 >> "Alex"
|
||||||
|
child*.2 >> "Jack"
|
||||||
|
c?ildren.0 >> "Sara"
|
||||||
|
fav\.movie >> "Deer Hunter"
|
||||||
|
friends.#.first >> ["Dale","Roger","Jane"]
|
||||||
|
friends.1.last >> "Craig"
|
||||||
|
|
||||||
|
You can also query an array for the first match by using #(...), or
|
||||||
|
find all matches with #(...)#. Queries support the ==, !=, <, <=, >,
|
||||||
|
>= comparison operators and the simple pattern matching % (like) and
|
||||||
|
!% (not like) operators. Eg:
|
||||||
|
|
||||||
|
friends.#(last=="Murphy").first >> "Dale"
|
||||||
|
friends.#(last=="Murphy")#.first >> ["Dale","Jane"]
|
||||||
|
friends.#(age>45)#.last >> ["Craig","Murphy"]
|
||||||
|
friends.#(first%"D*").last >> "Murphy"
|
||||||
|
friends.#(first!%"D*").last >> "Craig"
|
||||||
|
friends.#(nets.#(=="fb"))#.first >> ["Dale","Roger"]
|
||||||
|
|
||||||
|
Documentation: https://github.com/tidwall/gjson/blob/master/SYNTAX.md`
|
||||||
|
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "help-jsonpath",
|
||||||
|
Usage: "show jsonpath help",
|
||||||
|
|
||||||
|
Action: func(ctx context.Context, cmd *cli.Command) error {
|
||||||
|
_, err := fmt.Println(msg)
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func Version(conf *cfg.Config) *cli.Command {
|
func Version(conf *cfg.Config) *cli.Command {
|
||||||
return &cli.Command{
|
return &cli.Command{
|
||||||
Name: "version",
|
Name: "version",
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ package cmd
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"codeberg.org/scip/esctl/pkg/cfg"
|
"codeberg.org/scip/esctl/pkg/cfg"
|
||||||
"codeberg.org/scip/esctl/pkg/es"
|
"codeberg.org/scip/esctl/pkg/es"
|
||||||
@@ -125,13 +124,21 @@ func Search(conf *cfg.Config) *cli.Command {
|
|||||||
Destination: &conf.Or,
|
Destination: &conf.Or,
|
||||||
Aliases: []string{"O"},
|
Aliases: []string{"O"},
|
||||||
},
|
},
|
||||||
|
&cli.BoolFlag{
|
||||||
|
Name: "validate",
|
||||||
|
Usage: "validate search query",
|
||||||
|
Destination: &conf.Validate,
|
||||||
|
Aliases: []string{"v"},
|
||||||
|
},
|
||||||
|
&cli.BoolFlag{
|
||||||
|
Name: "explain",
|
||||||
|
Usage: "explain search query",
|
||||||
|
Destination: &conf.Explain,
|
||||||
|
Aliases: []string{"e"},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
Action: func(ctx context.Context, cmd *cli.Command) error {
|
Action: func(ctx context.Context, cmd *cli.Command) error {
|
||||||
if conf.Subhelp {
|
|
||||||
return showJsonPathHelp()
|
|
||||||
}
|
|
||||||
|
|
||||||
args := cmd.Args()
|
args := cmd.Args()
|
||||||
|
|
||||||
if conf.To == -1 {
|
if conf.To == -1 {
|
||||||
@@ -142,34 +149,3 @@ func Search(conf *cfg.Config) *cli.Command {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func showJsonPathHelp() error {
|
|
||||||
_, err := fmt.Println(`jsonPath usage:
|
|
||||||
|
|
||||||
name.last >> "Anderson"
|
|
||||||
age >> 37
|
|
||||||
children >> ["Sara","Alex","Jack"]
|
|
||||||
children.# >> 3
|
|
||||||
children.1 >> "Alex"
|
|
||||||
child*.2 >> "Jack"
|
|
||||||
c?ildren.0 >> "Sara"
|
|
||||||
fav\.movie >> "Deer Hunter"
|
|
||||||
friends.#.first >> ["Dale","Roger","Jane"]
|
|
||||||
friends.1.last >> "Craig"
|
|
||||||
|
|
||||||
You can also query an array for the first match by using #(...), or
|
|
||||||
find all matches with #(...)#. Queries support the ==, !=, <, <=, >,
|
|
||||||
>= comparison operators and the simple pattern matching % (like) and
|
|
||||||
!% (not like) operators. Eg:
|
|
||||||
|
|
||||||
friends.#(last=="Murphy").first >> "Dale"
|
|
||||||
friends.#(last=="Murphy")#.first >> ["Dale","Jane"]
|
|
||||||
friends.#(age>45)#.last >> ["Craig","Murphy"]
|
|
||||||
friends.#(first%"D*").last >> "Murphy"
|
|
||||||
friends.#(first!%"D*").last >> "Craig"
|
|
||||||
friends.#(nets.#(=="fb"))#.first >> ["Dale","Roger"]
|
|
||||||
|
|
||||||
Documentation: https://github.com/tidwall/gjson/blob/master/SYNTAX.md`)
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -70,6 +70,7 @@ type Config struct {
|
|||||||
Range string // search: -r
|
Range string // search: -r
|
||||||
TimestampFormat string // search: --timestamp-format
|
TimestampFormat string // search: --timestamp-format
|
||||||
Explain bool // search: -e
|
Explain bool // search: -e
|
||||||
|
Validate bool // search: --validate
|
||||||
SortBy string // sort: -k
|
SortBy string // sort: -k
|
||||||
Ascending bool // sort: -a
|
Ascending bool // sort: -a
|
||||||
Exclude string // cluster compare: -e (regexp)
|
Exclude string // cluster compare: -e (regexp)
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ package es
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
@@ -28,8 +29,10 @@ import (
|
|||||||
"github.com/alecthomas/repr"
|
"github.com/alecthomas/repr"
|
||||||
"github.com/elastic/go-elasticsearch/v9/typedapi/core/search"
|
"github.com/elastic/go-elasticsearch/v9/typedapi/core/search"
|
||||||
"github.com/elastic/go-elasticsearch/v9/typedapi/esdsl"
|
"github.com/elastic/go-elasticsearch/v9/typedapi/esdsl"
|
||||||
|
"github.com/elastic/go-elasticsearch/v9/typedapi/indices/validatequery"
|
||||||
"github.com/elastic/go-elasticsearch/v9/typedapi/types"
|
"github.com/elastic/go-elasticsearch/v9/typedapi/types"
|
||||||
"github.com/elastic/go-elasticsearch/v9/typedapi/types/enums/sortorder"
|
"github.com/elastic/go-elasticsearch/v9/typedapi/types/enums/sortorder"
|
||||||
|
"github.com/tidwall/gjson"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -43,8 +46,11 @@ Execute an ES search.
|
|||||||
additional filters can be given as -F key=value
|
additional filters can be given as -F key=value
|
||||||
*/
|
*/
|
||||||
func Search(conf *cfg.Config, queries []string) error {
|
func Search(conf *cfg.Config, queries []string) error {
|
||||||
searchEs := conf.DefaultCluster.ES.Search().
|
if conf.Validate {
|
||||||
Index(conf.Index)
|
return validateSearch(conf, queries)
|
||||||
|
}
|
||||||
|
|
||||||
|
searchEs := conf.DefaultCluster.ES.Search().Index(conf.Index)
|
||||||
|
|
||||||
queryCaster, err := prepareQuery(conf, queries)
|
queryCaster, err := prepareQuery(conf, queries)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -57,9 +63,11 @@ func Search(conf *cfg.Config, queries []string) error {
|
|||||||
|
|
||||||
searchEs = addSort(conf, searchEs)
|
searchEs = addSort(conf, searchEs)
|
||||||
|
|
||||||
switch conf.Tail {
|
switch {
|
||||||
case true:
|
case conf.Tail:
|
||||||
return searchTail(conf, searchEs)
|
return searchTail(conf, searchEs)
|
||||||
|
case conf.Explain:
|
||||||
|
return explainSearch(conf, searchEs)
|
||||||
default:
|
default:
|
||||||
if conf.To > MAXPAGE {
|
if conf.To > MAXPAGE {
|
||||||
return searchPit(conf, req)
|
return searchPit(conf, req)
|
||||||
@@ -69,6 +77,79 @@ func Search(conf *cfg.Config, queries []string) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func explainSearch(conf *cfg.Config, search *search.Search) error {
|
||||||
|
res, err := search.
|
||||||
|
Explain(true).
|
||||||
|
Size(1). // one's enough for explain
|
||||||
|
Do(context.Background())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to call explain search (esdsl): %s", esErrorString(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
raw, err := json.Marshal(res)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to marshal explain result: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if conf.Debug {
|
||||||
|
repr.Println(res)
|
||||||
|
value := gjson.Get(string(raw), "hits.hits.0._explanation")
|
||||||
|
fmt.Println(value.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(res.Hits.Hits) > 0 {
|
||||||
|
ex := res.Hits.Hits[0].Explanation_
|
||||||
|
fmt.Println(ex.Description)
|
||||||
|
fmt.Println(ex.Value)
|
||||||
|
|
||||||
|
// recurse into explanation details (it's a tree)
|
||||||
|
for _, ex := range ex.Details {
|
||||||
|
explain(&ex, " ")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func explain(res *types.ExplanationDetail, indent string) {
|
||||||
|
fmt.Println(indent + "- " + res.Description)
|
||||||
|
for _, ex := range res.Details {
|
||||||
|
fmt.Println(indent + " - " + ex.Description)
|
||||||
|
fmt.Println(indent + fmt.Sprintf(" score: %f", res.Value))
|
||||||
|
|
||||||
|
explain(&ex, indent+" ")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateSearch(conf *cfg.Config, queries []string) error {
|
||||||
|
validate := conf.DefaultCluster.ES.Indices.ValidateQuery()
|
||||||
|
|
||||||
|
queryCaster, err := prepareQuery(conf, queries)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
req := &validatequery.Request{Query: queryCaster}
|
||||||
|
|
||||||
|
validate.Request(req)
|
||||||
|
|
||||||
|
res, err := validate.
|
||||||
|
Do(context.Background())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to validate search (esdsl): %s", esErrorString(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Debug("ES result", "search", res)
|
||||||
|
|
||||||
|
if res.Valid {
|
||||||
|
fmt.Println(printer.Colorize(conf, "green", "valid"))
|
||||||
|
} else {
|
||||||
|
fmt.Println(printer.Colorize(conf, "red", "invalid"))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func Debug(conf *cfg.Config) error {
|
func Debug(conf *cfg.Config) error {
|
||||||
res, err := conf.DefaultCluster.ES.Search().
|
res, err := conf.DefaultCluster.ES.Search().
|
||||||
Index(conf.Index).
|
Index(conf.Index).
|
||||||
|
|||||||
Reference in New Issue
Block a user