Commit 10b87618 authored by ale's avatar ale
Browse files

Merge branch 'renovate/github.com-olivere-elastic-v7-7.x' into 'master'

Update module github.com/olivere/elastic/v7 to v7.0.26

See merge request !7
parents 9b547ee8 2f3f3590
Pipeline #18051 passed with stages
in 45 seconds
......@@ -4,4 +4,4 @@ go 1.11
// go: no requirements found in vendor/vendor.json
require github.com/olivere/elastic/v7 v7.0.25
require github.com/olivere/elastic/v7 v7.0.26
......@@ -26,7 +26,7 @@ import (
const (
// Version is the current version of Elastic.
Version = "7.0.25"
Version = "7.0.26"
// DefaultURL is the default endpoint of Elasticsearch on the local machine.
// It is used e.g. when initializing a new Client without a specific URL.
......
......@@ -168,13 +168,20 @@ func (s *ClusterStatsService) Do(ctx context.Context) (*ClusterStatsResponse, er
// ClusterStatsResponse is the response of ClusterStatsService.Do.
type ClusterStatsResponse struct {
NodesStats *ShardsInfo `json:"_nodes,omitempty"`
Timestamp int64 `json:"timestamp"`
ClusterName string `json:"cluster_name"`
ClusterUUID string `json:"cluster_uuid"`
Status string `json:"status,omitempty"` // e.g. green
Indices *ClusterStatsIndices `json:"indices"`
Nodes *ClusterStatsNodes `json:"nodes"`
NodesStats *ClusterStatsNodesResponse `json:"_nodes,omitempty"`
Timestamp int64 `json:"timestamp"`
ClusterName string `json:"cluster_name"`
ClusterUUID string `json:"cluster_uuid"`
Status string `json:"status,omitempty"` // e.g. green
Indices *ClusterStatsIndices `json:"indices"`
Nodes *ClusterStatsNodes `json:"nodes"`
}
type ClusterStatsNodesResponse struct {
Total int `json:"total"`
Successful int `json:"successful"`
Failed int `json:"failed"`
Failures []*FailedNodeException `json:"failures,omitempty"`
}
type ClusterStatsIndices struct {
......
version: '3'
services:
es1:
image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION:-7.13.2}
hostname: es1
environment:
- bootstrap.memory_lock=true
- cluster.name=elasticsearch
- cluster.initial_master_nodes=es1
- discovery.seed_hosts=es1
- cluster.routing.allocation.disk.threshold_enabled=false
- node.name=es1
- logger.org.elasticsearch=warn
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
ulimits:
nproc: 65536
nofile:
soft: 65536
hard: 65536
memlock:
soft: -1
hard: -1
# volumes:
# - ./data/elasticsearch:/usr/share/elasticsearch/data
ports:
- 9200:9200
es2:
image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION:-7.13.2}
hostname: es2
environment:
- bootstrap.memory_lock=true
- cluster.name=elasticsearch
- cluster.initial_master_nodes=es1
- discovery.seed_hosts=es1
- cluster.routing.allocation.disk.threshold_enabled=false
- node.name=es2
- logger.org.elasticsearch=warn
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
ulimits:
nproc: 65536
nofile:
soft: 65536
hard: 65536
memlock:
soft: -1
hard: -1
# volumes:
# - ./data/elasticsearch:/usr/share/elasticsearch/data
ports:
- 9201:9200
es3:
image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION:-7.13.2}
hostname: es3
environment:
- bootstrap.memory_lock=true
- cluster.name=elasticsearch
- cluster.initial_master_nodes=es1
- discovery.seed_hosts=es1
- cluster.routing.allocation.disk.threshold_enabled=false
- node.name=es3
- logger.org.elasticsearch=warn
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
ulimits:
nproc: 65536
nofile:
soft: 65536
hard: 65536
memlock:
soft: -1
hard: -1
# volumes:
# - ./data/elasticsearch:/usr/share/elasticsearch/data
ports:
- 9202:9200
......@@ -2,7 +2,7 @@ version: '3'
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2
image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION:-7.13.2}
hostname: elasticsearch
environment:
- cluster.name=elasticsearch
......@@ -29,7 +29,7 @@ services:
ports:
- 9200:9200
platinum:
image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2
image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION:-7.13.2}
hostname: elasticsearch-platinum
environment:
- cluster.name=platinum
......
......@@ -81,7 +81,9 @@ type ErrorDetails struct {
Grouped bool `json:"grouped,omitempty"`
CausedBy map[string]interface{} `json:"caused_by,omitempty"`
RootCause []*ErrorDetails `json:"root_cause,omitempty"`
Suppressed []*ErrorDetails `json:"suppressed,omitempty"`
FailedShards []map[string]interface{} `json:"failed_shards,omitempty"`
Header map[string]interface{} `json:"header,omitempty"`
// ScriptException adds the information in the following block.
......@@ -204,11 +206,23 @@ func IsStatusCode(err interface{}, code int) bool {
// ShardsInfo represents information from a shard.
type ShardsInfo struct {
Total int `json:"total"`
Successful int `json:"successful"`
Failed int `json:"failed"`
Failures []*FailedNodeException `json:"failures,omitempty"`
Skipped int `json:"skipped,omitempty"`
Total int `json:"total"`
Successful int `json:"successful"`
Failed int `json:"failed"`
Failures []*ShardOperationFailedException `json:"failures,omitempty"`
Skipped int `json:"skipped,omitempty"`
}
type ShardOperationFailedException struct {
Shard int `json:"shard,omitempty"`
Index string `json:"index,omitempty"`
Status string `json:"status,omitempty"`
Reason map[string]interface{} `json:"reason,omitempty"`
// TODO(oe) Do we still have those?
Node string `json:"_node,omitempty"`
// TODO(oe) Do we still have those?
Primary bool `json:"primary,omitempty"`
}
// FailedNodeException returns an error on the node level.
......
......@@ -5,7 +5,7 @@ github.com/mailru/easyjson
github.com/mailru/easyjson/buffer
github.com/mailru/easyjson/jlexer
github.com/mailru/easyjson/jwriter
# github.com/olivere/elastic/v7 v7.0.25
# github.com/olivere/elastic/v7 v7.0.26
github.com/olivere/elastic/v7
github.com/olivere/elastic/v7/config
github.com/olivere/elastic/v7/uritemplates
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment