Update to v7.11.0 (#575)
ci: Update Enterprise Search test for v3 index App Search API keys are now encrypted in Elasticsearch, so we simply ensure they exist and don't try to read their value.
This commit is contained in:
parent
980c5c480f
commit
75ebebcebb
|
@ -19,22 +19,12 @@ poll_ready "$cid_es" "http://${ip_es}:9200/" -u 'elastic:testpasswd'
|
||||||
log 'Waiting for readiness of Enterprise Search'
|
log 'Waiting for readiness of Enterprise Search'
|
||||||
poll_ready "$cid_en" "http://${ip_en}:3002/api/ent/v1/internal/health" -u 'elastic:testpasswd'
|
poll_ready "$cid_en" "http://${ip_en}:3002/api/ent/v1/internal/health" -u 'elastic:testpasswd'
|
||||||
|
|
||||||
log 'Retrieving private key from Elasticsearch'
|
log 'Ensuring that App Search API keys were created in Elasticsearch'
|
||||||
response="$(curl "http://${ip_es}:9200/.ent-search-actastic-app_search_api_tokens_v2/_search?q=name:private-key" -s -u elastic:testpasswd)"
|
response="$(curl "http://${ip_es}:9200/.ent-search-actastic-app_search_api_tokens_v3/_count?pretty" -s -u elastic:testpasswd)"
|
||||||
hits="$(jq -rn --argjson data "${response}" '$data.hits.hits')"
|
|
||||||
echo "$hits"
|
|
||||||
count="$(jq -rn --argjson data "${response}" '$data.hits.total.value')"
|
|
||||||
if [[ $count -ne 1 ]]; then
|
|
||||||
echo "Private key not found. Expected 1 result, got ${count}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
key="$(jq -rn --argjson data "${hits}" '$data[0]._source.authentication_token')"
|
|
||||||
|
|
||||||
log 'Creating App Search engine'
|
|
||||||
response="$(curl "http://${ip_en}:3002/api/as/v1/engines" -s -d '{"name": "dockerelk"}' -H "Authorization: Bearer ${key}")"
|
|
||||||
echo "$response"
|
echo "$response"
|
||||||
name="$(jq -rn --argjson data "${response}" '$data.name')"
|
declare -i count
|
||||||
if [[ $name != 'dockerelk' ]]; then
|
count="$(jq -rn --argjson data "${response}" '$data.count')"
|
||||||
echo 'Failed to create engine'
|
if (( count != 2)); then
|
||||||
|
echo "Expected search and private keys, got ${count} result(s)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Elastic stack (ELK) on Docker
|
# Elastic stack (ELK) on Docker
|
||||||
|
|
||||||
[](https://www.elastic.co/blog/category/releases)
|
[](https://www.elastic.co/blog/category/releases)
|
||||||
[](https://github.com/deviantony/docker-elk/actions?query=workflow%3ACI+branch%3Amain)
|
[](https://github.com/deviantony/docker-elk/actions?query=workflow%3ACI+branch%3Amain)
|
||||||
[](https://gitter.im/deviantony/docker-elk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
[](https://gitter.im/deviantony/docker-elk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||||
|
|
||||||
|
@ -256,7 +256,7 @@ Create an index pattern via the Kibana API:
|
||||||
```console
|
```console
|
||||||
$ curl -XPOST -D- 'http://localhost:5601/api/saved_objects/index-pattern' \
|
$ curl -XPOST -D- 'http://localhost:5601/api/saved_objects/index-pattern' \
|
||||||
-H 'Content-Type: application/json' \
|
-H 'Content-Type: application/json' \
|
||||||
-H 'kbn-version: 7.10.2' \
|
-H 'kbn-version: 7.11.0' \
|
||||||
-u elastic:<your generated elastic password> \
|
-u elastic:<your generated elastic password> \
|
||||||
-d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}'
|
-d '{"attributes":{"title":"logstash-*","timeFieldName":"@timestamp"}}'
|
||||||
```
|
```
|
||||||
|
|
|
@ -3,7 +3,7 @@ version: '3.3'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
|
image: docker.elastic.co/elasticsearch/elasticsearch:7.11.0
|
||||||
ports:
|
ports:
|
||||||
- "9200:9200"
|
- "9200:9200"
|
||||||
- "9300:9300"
|
- "9300:9300"
|
||||||
|
@ -25,7 +25,7 @@ services:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
|
||||||
logstash:
|
logstash:
|
||||||
image: docker.elastic.co/logstash/logstash:7.10.2
|
image: docker.elastic.co/logstash/logstash:7.11.0
|
||||||
ports:
|
ports:
|
||||||
- "5044:5044"
|
- "5044:5044"
|
||||||
- "5000:5000"
|
- "5000:5000"
|
||||||
|
@ -44,7 +44,7 @@ services:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
|
||||||
kibana:
|
kibana:
|
||||||
image: docker.elastic.co/kibana/kibana:7.10.2
|
image: docker.elastic.co/kibana/kibana:7.11.0
|
||||||
ports:
|
ports:
|
||||||
- "5601:5601"
|
- "5601:5601"
|
||||||
configs:
|
configs:
|
||||||
|
|
Loading…
Reference in New Issue