Skip to content

Commit 81267be

Browse files
cjnolancjnolan
committed
fix: Update dependency check to enforce service start on file creation
1 parent 5d02b5b commit 81267be

9 files changed

+52
-10
lines changed

‎SPECS/platform-observability-agent/env_wrapper_collector.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,14 @@ update_otelcol_config() {
3737

3838
update_otelcol_config
3939

40+
while true
41+
do
42+
if [ -f /etc/intel_edge_node/tokens/platform-observability-agent/access_token ]; then
43+
echo "Starting Platform Observability Collector Service"
44+
break
45+
else
46+
sleep 10
47+
fi
48+
done
49+
4050
exec "$@"

‎SPECS/platform-observability-agent/env_wrapper_health_check.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,14 @@ update_health_check_config() {
1919

2020
update_health_check_config
2121

22+
while true
23+
do
24+
if [ -e /run/platform-observability-agent/agent-logs.sock ]; then
25+
echo "Starting Platform Observability Health Check Service"
26+
break
27+
else
28+
sleep 10
29+
fi
30+
done
31+
2232
exec "$@"

‎SPECS/platform-observability-agent/env_wrapper_logging.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,14 @@ update_fluentbit_config() {
1919

2020
update_fluentbit_config
2121

22+
while true
23+
do
24+
if [ -e /run/platform-observability-agent/agent-logs.sock ]; then
25+
echo "Starting Platform Observability Logging Service"
26+
break
27+
else
28+
sleep 10
29+
fi
30+
done
31+
2232
exec "$@"

‎SPECS/platform-observability-agent/env_wrapper_metrics.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
while true
4+
do
5+
if [ -e /run/platform-observability-agent/platform-observability-agent.sock ]; then
6+
echo "Starting Platform Observability Metrics Service"
7+
break
8+
else
9+
sleep 10
10+
fi
11+
done
12+
13+
exec "$@"

‎SPECS/platform-observability-agent/platform-observability-agent.signatures.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"Signatures": {
33
"platform-observability-agent-1.8.0.tar.gz": "fd76ace1bc5ca993cf7e38fe6d64be8d4452fde86cf768962006a4b33788bc53",
44
"platform-observability-collector.service": "11ebad24cbbae4a24b70c11087124aba4e7077390ee4dd4496fdd42e226d4333",
5-
"platform-observability-health-check.service": "adb975205ddbc6409975cd2edc56a038676a7b3147e3c7fca2d792a342ae5d9e",
6-
"platform-observability-logging.service": "447201574b259a30cf766a3874edf58ddc68e430eef4c110ce1f5b1becaf5acc",
7-
"platform-observability-metrics.service": "9019640667e6a95727d4f7731735af249bab68a735c831f899ac1d64536a0d5f",
8-
"env_wrapper_collector.sh": "452a07045fc9418c19771f91b55b61714538e2abe0607f6417b079dd4d7c7a97",
9-
"env_wrapper_health_check.sh": "fb205586dfb9b1dc0f9a506ccbf42b0ba17da57e03dfeb944e866acc154e4eb1",
10-
"env_wrapper_logging.sh": "eebd8a386a4b6c7f6fe9307fa0f7c2c6258023b0d95a561a1b7639ea737a8dda",
5+
"platform-observability-health-check.service": "121f3d26944952b45f018ca9b7bbeb7a3d55a89f8d32d4ef6a04b67a5497101e",
6+
"platform-observability-logging.service": "4b375f9fbdd2ddc1d7b0c1021593d02fd02156e28a1474c156a7b698a07db5e3",
7+
"platform-observability-metrics.service": "cd3fa0f8b7ea28e533317ce493add7c8e3a9c2d0e40c1e18ee14ead762b98c40",
8+
"env_wrapper_collector.sh": "61561f8256dd47f9d60e55113822946744d3fe2b4d0d76803a22e3ea148660fe",
9+
"env_wrapper_health_check.sh": "5289d3af3097a6cc2164faa370c812b42aee999ebb1ce8c1e0773dc5592a1db4",
10+
"env_wrapper_logging.sh": "96593d401b7447d0d997b661f71ba54d60eacc14811956300df9ef0f3ef33758",
11+
"env_wrapper_metrics.sh": "ab5997b5a67c9edb2e56208cf2db8a79fbfb9e1ae7cf5653bf9aae5b99049eee",
1112
"platform-observability-agent.conf": "1b4d3b7fd155a6f543748e1017e04aed535bd1bbfc0520d9d5e53f5b0b45eb32"
1213
}
1314
}

‎SPECS/platform-observability-agent/platform-observability-agent.spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/edge-node/node/confs
4646
install -m 744 %{SOURCE5} %{buildroot}%{_sysconfdir}/edge-node/node/confs/platform-observability-collector
4747
install -m 744 %{SOURCE6} %{buildroot}%{_sysconfdir}/edge-node/node/confs/platform-observability-health-check
4848
install -m 744 %{SOURCE7} %{buildroot}%{_sysconfdir}/edge-node/node/confs/platform-observability-logging
49+
install -m 744 %{SOURCE7} %{buildroot}%{_sysconfdir}/edge-node/node/confs/platform-observability-metrics
4950

5051
mkdir -p %{buildroot}%{_sysconfdir}/fluent-bit
5152
cp configs/fluent-bit.conf %{buildroot}%{_sysconfdir}/fluent-bit

‎SPECS/platform-observability-agent/platform-observability-health-check.service‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[Unit]
22
Description=Platform Observability Health Check Agent
33
Documentation=https://github.com/open-edge-platform/edge-node-agents/blob/main/platform-observability-agent/README.md
4-
After=platform-observability-collector.service
54

65
[Service]
76
Type=simple

‎SPECS/platform-observability-agent/platform-observability-logging.service‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[Unit]
22
Description=Platform Observability Logging Agent
33
Documentation=https://github.com/open-edge-platform/edge-node-agents/blob/main/platform-observability-agent/README.md
4-
After=platform-observability-collector.service
54

65
[Service]
76
Type=simple

‎SPECS/platform-observability-agent/platform-observability-metrics.service‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
[Unit]
22
Description=Platform Observability Metrics Agent
33
Documentation=https://github.com/open-edge-platform/edge-node-agents/blob/main/platform-observability-agent/README.md
4-
After=platform-observability-collector.service
54

65
[Service]
76
Type=simple
87
AmbientCapabilities=CAP_SYS_RAWIO CAP_DAC_READ_SEARCH CAP_SYS_ADMIN
98
Environment="SF_OCSP_RESPONSE_CACHE_DIR=/opt/telegraf/"
109
EnvironmentFile=-/etc/sysconfig/telegraf
1110
EnvironmentFile=-/etc/default/telegraf
12-
ExecStart=/usr/bin/telegraf --config /etc/telegraf/telegraf.d/poa-telegraf.conf
11+
ExecStart=/etc/edge-node/node/confs/platform-observability-metrics /usr/bin/telegraf --config /etc/telegraf/telegraf.d/poa-telegraf.conf
1312
StandardOutput=null
1413
StandardError=journal
1514
RestartSec=60

0 commit comments

Comments
 (0)