Skip to content

Commit 6179f5d

Browse files
authored
Update stderr redirections in scripts (#2819)
1 parent 40e5629 commit 6179f5d

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.buildkite/scripts/tooling.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ upload_safe_logs() {
101101
local source="$2"
102102
local target="$3"
103103

104-
if ! ls ${source} 2>&1 > /dev/null ; then
105-
echo "upload_safe_logs: artifacts files not found, nothing will be archived"
104+
if ! ls ${source} > /dev/null 2>&1; then
105+
echo "upload_safe_logs: artifacts files not found at ${source}, nothing will be archived"
106106
return
107107
fi
108108

internal/profile/testdata/migration-home-legacy/profiles/default/stack/kibana_healthcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
set -e
44

5-
curl -s --cacert /usr/share/kibana/config/certs/ca-cert.pem -f https://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null
5+
curl -s --cacert /usr/share/kibana/config/certs/ca-cert.pem -f https://localhost:5601/login | grep kbn-injected-metadata >/dev/null
66
curl -s --cacert /usr/share/kibana/config/certs/ca-cert.pem -f -u elastic:changeme "https://elasticsearch:9200/_cat/indices/.security-*?h=health" | grep -v red

internal/profile/testdata/migration-home-legacy/profiles/default/stack/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ services:
9191
kibana:
9292
condition: service_healthy
9393
healthcheck:
94-
test: "curl --cacert /etc/ssl/elastic-agent/ca-cert.pem -f https://localhost:8220/api/status | grep -i healthy 2>&1 >/dev/null"
94+
test: "curl --cacert /etc/ssl/elastic-agent/ca-cert.pem -f https://localhost:8220/api/status | grep -i healthy >/dev/null"
9595
start_period: 60s
9696
interval: 5s
9797
hostname: docker-fleet-server

internal/stack/_static/fleet-server-healthcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ NUMBER_SUCCESSES="$1"
66
WAITING_TIME="$2"
77

88
healthcheck() {
9-
curl -s --cacert /etc/ssl/certs/elastic-package.pem -f https://localhost:8220/api/status | grep -i healthy 2>&1 >/dev/null
9+
curl -s --cacert /etc/ssl/certs/elastic-package.pem -f https://localhost:8220/api/status | grep -i healthy >/dev/null
1010
}
1111

1212
# Fleet Server can restart after announcing to be healthy, agents connecting during this restart will

internal/stack/_static/kibana-healthcheck.sh.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
set -e
44

5-
curl -s --cacert /usr/share/kibana/config/certs/ca-cert.pem -f https://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null
5+
curl -s --cacert /usr/share/kibana/config/certs/ca-cert.pem -f https://localhost:5601/login | grep kbn-injected-metadata >/dev/null
66
curl -s --cacert /usr/share/kibana/config/certs/ca-cert.pem -f -u {{ fact "username" }}:{{ fact "password" }} "https://elasticsearch:9200/_cat/indices/.security-*?h=health" | grep -v red

0 commit comments

Comments
 (0)