Skip to content

Adding x-pack code for elasticsearch/index metricset #8260

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

Merged
ycombinator merged 14 commits into from
Sep 18, 2018
Merged

Adding x-pack code for elasticsearch/index metricset #8260

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
76c690f
Updating test fixture
ycombinator Sep 7, 2018
4becb30
Extract indicesStruct for reuse within package
ycombinator Sep 7, 2018
b24c911
Only request specific stats
ycombinator Sep 7, 2018
b691c87
Add X-Pack switch
ycombinator Sep 7, 2018
18b84b9
Adding explanatory comment
ycombinator Sep 7, 2018
ccae367
Fleshing it out some more
ycombinator Sep 7, 2018
1632a59
Remove empty TODO
ycombinator Sep 10, 2018
27ae53c
Adding reference comment for fields + refactoring into helper funcs
ycombinator Sep 10, 2018
e1008b1
Re-formatting
ycombinator Sep 10, 2018
51af6e9
Extract stats API metrics into own const
ycombinator Sep 10, 2018
7943776
Using errors.Wrap
ycombinator Sep 10, 2018
df463f2
Adding logger to elasticsearch metricset
ycombinator Sep 10, 2018
e33c0ac
Log errors
ycombinator Sep 10, 2018
e92acb8
Sharing the type not the variable :facepalm:
ycombinator Sep 12, 2018
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
3 changes: 2 additions & 1 deletion metricbeat/module/elasticsearch/cluster_stats/data_xpack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ func eventMappingXPack(r mb.ReporterV2, m *MetricSet, content []byte) error {
return err
}

clusterState, err := elasticsearch.GetClusterState(m.HTTP, m.HTTP.GetURI())
clusterStateMetrics := []string{"version", "master_node", "nodes", "routing_table"}
clusterState, err := elasticsearch.GetClusterState(m.HTTP, m.HTTP.GetURI(), clusterStateMetrics)
if err != nil {
return err
}
Expand Down
10 changes: 8 additions & 2 deletions metricbeat/module/elasticsearch/elasticsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"encoding/json"
"fmt"
"net/url"
"strings"
"sync"
"time"

Expand Down Expand Up @@ -201,8 +202,13 @@ func GetLicense(http *helper.HTTP, resetURI string) (common.MapStr, error) {
}

// GetClusterState returns cluster state information
func GetClusterState(http *helper.HTTP, resetURI string) (common.MapStr, error) {
content, err := fetchPath(http, resetURI, "_cluster/state/version,master_node,nodes,routing_table")
func GetClusterState(http *helper.HTTP, resetURI string, metrics []string) (common.MapStr, error) {
clusterStateURI := "_cluster/state"
if metrics != nil && len(metrics) > 0 {
clusterStateURI += "/" + strings.Join(metrics, ",")
}

content, err := fetchPath(http, resetURI, clusterStateURI)
if err != nil {
return nil, err
}
Expand Down
Loading