feat: add support to elasticsearch v2.x

collector/nodes.go

@@ -213,6 +213,14 @@ func NewNodes(logger log.Logger, client *http.Client, url *url.URL, all bool, no
 					defaultNodeLabels, nil,
 				),
 				Value: func(node NodeStatsNodeResponse) float64 {
+					// LoadAvg was an array of per-cpu values pre-2.0, and is a float in 2.x
+					if node.OS.LoadAvg != nil {
+						// trying parse as float
+						var loadAvgAsFloat float64
+						if json.Unmarshal(*node.OS.LoadAvg, &loadAvgAsFloat) == nil {
+							return loadAvgAsFloat
+						}
+					}
 					return node.OS.CPU.LoadAvg.Load1
 				},
 				Labels: defaultNodeLabelValues,
@@ -249,6 +257,9 @@ func NewNodes(logger log.Logger, client *http.Client, url *url.URL, all bool, no
 					defaultNodeLabels, nil,
 				),
 				Value: func(node NodeStatsNodeResponse) float64 {
+					if node.OS.CPUPercent != nil {
+						return float64(*node.OS.CPUPercent)
+					}
 					return float64(node.OS.CPU.Percent)
 				},
 				Labels: defaultNodeLabelValues,
@@ -517,6 +528,42 @@ func NewNodes(logger log.Logger, client *http.Client, url *url.URL, all bool, no
 				},
 				Labels: defaultNodeLabelValues,
 			},
+			{
+				Type: prometheus.CounterValue,
+				Desc: prometheus.NewDesc(
+					prometheus.BuildFQName(namespace, "indices", "suggest_total"),
+					"Total suggest",
+					defaultNodeLabels, nil,
+				),
+				Value: func(node NodeStatsNodeResponse) float64 {
+					return float64(node.Indices.Suggest.Total)
+				},
+				Labels: defaultNodeLabelValues,
+			},
+			{
+				Type: prometheus.CounterValue,
+				Desc: prometheus.NewDesc(
+					prometheus.BuildFQName(namespace, "indices", "suggest_time_seconds"),
+					"Total suggest time in seconds",
+					defaultNodeLabels, nil,
+				),
+				Value: func(node NodeStatsNodeResponse) float64 {
+					return float64(node.Indices.Suggest.Time) / 1000
+				},
+				Labels: defaultNodeLabelValues,
+			},
+			{
+				Type: prometheus.GaugeValue,
+				Desc: prometheus.NewDesc(
+					prometheus.BuildFQName(namespace, "indices", "suggest_current"),
+					"Current suggest",
+					defaultNodeLabels, nil,
+				),
+				Value: func(node NodeStatsNodeResponse) float64 {
+					return float64(node.Indices.Suggest.Current)
+				},
+				Labels: defaultNodeLabelValues,
+			},
 			{
 				Type: prometheus.CounterValue,
 				Desc: prometheus.NewDesc(

collector/nodes_response.go

@@ -149,6 +149,7 @@ type NodeStatsIndicesResponse struct {
 	Segments     NodeStatsIndicesSegmentsResponse
 	Refresh      NodeStatsIndicesRefreshResponse
 	Translog     NodeStatsIndicesTranslogResponse
+	Suggest      NodeStatsIndicesSuggestResponse
 	Completion   NodeStatsIndicesCompletionResponse
 }
 
@@ -170,6 +171,13 @@ type NodeStatsIndicesTranslogResponse struct {
 	Size       int64 `json:"size_in_bytes"`
 }
 
+// NodeStatsIndicesSuggestResponse defines node stats suggest information structure for indices
+type NodeStatsIndicesSuggestResponse struct {
+	Total   int64 `json:"total"`
+	Time    int64 `json:"time_in_millis"`
+	Current int64 `json:"current"`
+}
+
 // NodeStatsIndicesCompletionResponse defines node stats completion information structure for indices
 type NodeStatsIndicesCompletionResponse struct {
 	Size int64 `json:"size_in_bytes"`
@@ -271,14 +279,13 @@ type NodeStatsIndicesCacheResponse struct {
 
 // NodeStatsOSResponse is a representation of a  operating system stats, load average, mem, swap
 type NodeStatsOSResponse struct {
-	Timestamp int64 `json:"timestamp"`
-	Uptime    int64 `json:"uptime_in_millis"`
-	// LoadAvg was an array of per-cpu values pre-2.0, and is a string in 2.0
-	// Leaving this here in case we want to implement parsing logic later
-	LoadAvg json.RawMessage         `json:"load_average"`
-	CPU     NodeStatsOSCPUResponse  `json:"cpu"`
-	Mem     NodeStatsOSMemResponse  `json:"mem"`
-	Swap    NodeStatsOSSwapResponse `json:"swap"`
+	Timestamp  int64                   `json:"timestamp"`
+	Uptime     int64                   `json:"uptime_in_millis"`
+	LoadAvg    *json.RawMessage        `json:"load_average"`
+	CPU        NodeStatsOSCPUResponse  `json:"cpu"`
+	CPUPercent *int64                  `json:"cpu_percent"`
+	Mem        NodeStatsOSMemResponse  `json:"mem"`
+	Swap       NodeStatsOSSwapResponse `json:"swap"`
 }
 
 // NodeStatsOSMemResponse defines node stats operating system memory usage structure

collector/versions_test.go

@@ -14,6 +14,7 @@
 package collector
 
 var testElasticsearchVersions = []string{
+	"2.4.6",
 	"5.4.2",
 	"5.6.16",
 	"6.5.4",

fixtures/nodestats/2.4.6.json

@@ -0,0 +1 @@
+{"cluster_name":"elasticsearch","nodes":{"wKGSynKDTSCFbzwmoIhfQQ":{"timestamp":1653930999625,"name":"es2","transport_address":"127.0.0.1:9300","host":"127.0.0.1","ip":"127.0.0.1:9300","indices":{"docs":{"count":5,"deleted":0},"store":{"size_in_bytes":5337,"throttle_time_in_millis":0},"indexing":{"index_total":5,"index_time_in_millis":47,"index_current":0,"index_failed":0,"delete_total":0,"delete_time_in_millis":0,"delete_current":0,"noop_update_total":0,"is_throttled":false,"throttle_time_in_millis":0},"get":{"total":0,"time_in_millis":0,"exists_total":0,"exists_time_in_millis":0,"missing_total":0,"missing_time_in_millis":0,"current":0},"search":{"open_contexts":0,"query_total":0,"query_time_in_millis":0,"query_current":0,"fetch_total":0,"fetch_time_in_millis":0,"fetch_current":0,"scroll_total":0,"scroll_time_in_millis":0,"scroll_current":0},"merges":{"current":0,"current_docs":0,"current_size_in_bytes":0,"total":0,"total_time_in_millis":0,"total_docs":0,"total_size_in_bytes":0,"total_stopped_time_in_millis":0,"total_throttled_time_in_millis":0,"total_auto_throttle_in_bytes":629145600},"refresh":{"total":5,"total_time_in_millis":98},"flush":{"total":0,"total_time_in_millis":0},"warmer":{"current":0,"total":35,"total_time_in_millis":4},"query_cache":{"memory_size_in_bytes":0,"total_count":0,"hit_count":0,"miss_count":0,"cache_size":0,"cache_count":0,"evictions":0},"fielddata":{"memory_size_in_bytes":0,"evictions":0},"percolate":{"total":0,"time_in_millis":0,"current":0,"memory_size_in_bytes":-1,"memory_size":"-1b","queries":0},"completion":{"size_in_bytes":0},"segments":{"count":5,"memory_in_bytes":12940,"terms_memory_in_bytes":9960,"stored_fields_memory_in_bytes":1560,"term_vectors_memory_in_bytes":0,"norms_memory_in_bytes":960,"doc_values_memory_in_bytes":460,"index_writer_memory_in_bytes":0,"index_writer_max_memory_in_bytes":0,"version_map_memory_in_bytes":0,"fixed_bit_set_memory_in_bytes":0},"translog":{"operations":5,"size_in_bytes":1743},"suggest":{"total":0,"time_in_millis":0,"current":0},"request_cache":{"memory_size_in_bytes":0,"evictions":0,"hit_count":0,"miss_count":0},"recovery":{"current_as_source":0,"current_as_target":0,"throttle_time_in_millis":0}},"os":{"timestamp":1653930999538,"cpu_percent":6,"load_average":0.6,"mem":{"total_in_bytes":33623236608,"free_in_bytes":7032000512,"used_in_bytes":26591236096,"free_percent":21,"used_percent":79},"swap":{"total_in_bytes":2147479552,"free_in_bytes":85319680,"used_in_bytes":2062159872}},"process":{"timestamp":1653930999538,"open_file_descriptors":305,"max_file_descriptors":1048576,"cpu":{"percent":9,"total_in_millis":13610},"mem":{"total_virtual_in_bytes":8294236160}},"jvm":{"timestamp":1653930999538,"uptime_in_millis":9330681,"mem":{"heap_used_in_bytes":569163128,"heap_used_percent":27,"heap_committed_in_bytes":2077753344,"heap_max_in_bytes":2077753344,"non_heap_used_in_bytes":68846616,"non_heap_committed_in_bytes":73859072,"pools":{"young":{"used_in_bytes":518547608,"max_in_bytes":558432256,"peak_used_in_bytes":558432256,"peak_max_in_bytes":558432256},"survivor":{"used_in_bytes":50615520,"max_in_bytes":69730304,"peak_used_in_bytes":50615520,"peak_max_in_bytes":69730304},"old":{"used_in_bytes":0,"max_in_bytes":1449590784,"peak_used_in_bytes":0,"peak_max_in_bytes":1449590784}}},"threads":{"count":61,"peak_count":61},"gc":{"collectors":{"young":{"collection_count":1,"collection_time_in_millis":24},"old":{"collection_count":1,"collection_time_in_millis":120}}},"buffer_pools":{"direct":{"count":47,"used_in_bytes":252727741,"total_capacity_in_bytes":252727740},"mapped":{"count":5,"used_in_bytes":15007,"total_capacity_in_bytes":15007}},"classes":{"current_loaded_count":10411,"total_loaded_count":10411,"total_unloaded_count":0}},"thread_pool":{"bulk":{"threads":5,"queue":0,"active":0,"rejected":0,"largest":5,"completed":5},"fetch_shard_started":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"fetch_shard_store":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"flush":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"force_merge":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"generic":{"threads":4,"queue":0,"active":0,"rejected":0,"largest":4,"completed":38},"get":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"index":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"listener":{"threads":4,"queue":0,"active":0,"rejected":0,"largest":4,"completed":5},"management":{"threads":1,"queue":0,"active":1,"rejected":0,"largest":1,"completed":2},"percolate":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"refresh":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":31},"search":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"snapshot":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"suggest":{"threads":0,"queue":0,"active":0,"rejected":0,"largest":0,"completed":0},"warmer":{"threads":1,"queue":0,"active":0,"rejected":0,"largest":1,"completed":5}},"fs":{"timestamp":1653930999539,"total":{"total_in_bytes":476630163456,"free_in_bytes":77533327360,"available_in_bytes":77533327360,"spins":"true"},"data":[{"path":"/usr/share/elasticsearch/data/nodes/0","mount":"/usr/share/elasticsearch/data (/dev/mapper/vg0-root)","type":"xfs","total_in_bytes":476630163456,"free_in_bytes":77533327360,"available_in_bytes":77533327360,"spins":"true"}]},"transport":{"server_open":0,"rx_count":0,"rx_size_in_bytes":0,"tx_count":0,"tx_size_in_bytes":0},"http":{"current_open":1,"total_opened":16},"breakers":{"request":{"limit_size_in_bytes":1246652006,"limit_size":"1.1gb","estimated_size_in_bytes":0,"estimated_size":"0b","overhead":1,"tripped":0},"fielddata":{"limit_size_in_bytes":1246652006,"limit_size":"1.1gb","estimated_size_in_bytes":0,"estimated_size":"0b","overhead":1.03,"tripped":0},"in_flight_requests":{"limit_size_in_bytes":2077753344,"limit_size":"1.9gb","estimated_size_in_bytes":0,"estimated_size":"0b","overhead":1,"tripped":0},"parent":{"limit_size_in_bytes":1454427340,"limit_size":"1.3gb","estimated_size_in_bytes":0,"estimated_size":"0b","overhead":1,"tripped":0}},"script":{"compilations":0,"cache_evictions":0}}}}