Skip to content

Commit 61c0781

Browse files
authored
Merge branch 'main' into chore/remove-4.1.0
2 parents f22309e + 2091f39 commit 61c0781

4 files changed

Lines changed: 67 additions & 32 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
2222

2323
### Removed
2424

25+
- test: Bump vector-aggregator to 0.55.0, replace /graphql call with gRPC call ([#713]).
2526
- Removed support for `4.1.0` ([#711]).
2627

2728
[#674]: https://github.com/stackabletech/hive-operator/pull/674
@@ -30,6 +31,7 @@ All notable changes to this project will be documented in this file.
3031
[#702]: https://github.com/stackabletech/hive-operator/pull/702
3132
[#707]: https://github.com/stackabletech/hive-operator/pull/707
3233
[#711]: https://github.com/stackabletech/hive-operator/pull/711
34+
[#713]: https://github.com/stackabletech/hive-operator/pull/713
3335

3436
## [26.3.0] - 2026-03-16
3537

tests/templates/kuttl/logging/01-install-hbase-vector-aggregator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ commands:
55
- script: >-
66
helm install hive-vector-aggregator vector
77
--namespace "$NAMESPACE"
8-
--version 0.49.0
8+
--version 0.52.0 `# app version 0.55.0`
99
--repo https://helm.vector.dev
1010
--values hive-vector-aggregator-values.yaml
1111
---

tests/templates/kuttl/logging/test_log_aggregation.py

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,40 @@
1-
#!/usr/bin/env python3
2-
import requests
1+
import json
2+
import subprocess
33

44

55
def check_sent_events():
6-
response = requests.post(
7-
"http://hive-vector-aggregator:8686/graphql",
8-
json={
9-
"query": """
10-
{
11-
transforms(first:100) {
12-
nodes {
13-
componentId
14-
metrics {
15-
sentEventsTotal {
16-
sentEventsTotal
17-
}
18-
}
19-
}
20-
}
21-
}
22-
"""
23-
},
6+
response = subprocess.run(
7+
[
8+
"grpcurl",
9+
"-plaintext",
10+
"-d",
11+
'{"limit": 100}',
12+
"hive-vector-aggregator:8686",
13+
"vector.observability.v1.ObservabilityService/GetComponents",
14+
],
15+
capture_output=True,
16+
text=True,
17+
check=True, # Raise a CalledProcessError if non-zero return
18+
timeout=20, # seconds
2419
)
20+
result = json.loads(response.stdout)
21+
components = result.get("components", [])
22+
transforms = [
23+
c for c in components if c.get("componentType") == "COMPONENT_TYPE_TRANSFORM"
24+
]
2525

26-
assert response.status_code == 200, (
27-
"Cannot access the API of the vector aggregator."
28-
)
29-
30-
result = response.json()
26+
assert len(transforms) > 0, "No transform components found"
3127

32-
transforms = result["data"]["transforms"]["nodes"]
3328
for transform in transforms:
3429
sentEvents = transform["metrics"]["sentEventsTotal"]
3530
componentId = transform["componentId"]
3631

3732
if componentId == "filteredInvalidEvents":
38-
assert sentEvents is None or sentEvents["sentEventsTotal"] == 0, (
33+
assert sentEvents is None or int(sentEvents) == 0, (
3934
"Invalid log events were sent."
4035
)
4136
else:
42-
assert sentEvents is not None and sentEvents["sentEventsTotal"] > 0, (
37+
assert sentEvents is not None and int(sentEvents) > 0, (
4338
f'No events were sent in "{componentId}".'
4439
)
4540

tests/templates/kuttl/smoke/60-assert.yaml.j2

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@ spec:
143143
topologyKey: kubernetes.io/hostname
144144
weight: 70
145145
containers:
146-
{% if lookup('env', 'VECTOR_AGGREGATOR') %}
147-
- name: vector
148-
{% endif %}
149146
- args:
150147
- |
151148
echo copying /stackable/mount/config to /stackable/config
@@ -290,10 +287,51 @@ spec:
290287
name: log-config-mount
291288
- mountPath: /stackable/listener
292289
name: listener
290+
{% if lookup('env', 'VECTOR_AGGREGATOR') %}
291+
- args:
292+
- |
293+
mkdir --parents /stackable/log/_vector-state
294+
# Vector will ignore SIGTERM (as PID != 1) and must be shut down by writing a shutdown trigger file
295+
vector --config /stackable/config/vector.yaml & vector_pid=$!
296+
if [ ! -f "/stackable/log/_vector/shutdown" ]; then
297+
mkdir -p /stackable/log/_vector && inotifywait -qq --event create /stackable/log/_vector; fi
298+
sleep 1
299+
kill $vector_pid
300+
command:
301+
- /bin/bash
302+
- -x
303+
- -euo
304+
- pipefail
305+
- -c
306+
env:
307+
- name: VECTOR_LOG
308+
value: info
309+
- name: VECTOR_AGGREGATOR_ADDRESS
310+
valueFrom:
311+
configMapKeyRef:
312+
key: ADDRESS
313+
name: vector-aggregator-discovery
314+
imagePullPolicy: IfNotPresent
315+
name: vector
316+
resources:
317+
limits:
318+
cpu: 500m
319+
memory: 128Mi
320+
requests:
321+
cpu: 250m
322+
memory: 128Mi
323+
volumeMounts:
324+
- mountPath: /stackable/config
325+
name: config-mount
326+
- mountPath: /stackable/log
327+
name: log
328+
{% endif %}
293329
dnsPolicy: ClusterFirst
294330
enableServiceLinks: false
295331
restartPolicy: Always
296332
schedulerName: default-scheduler
333+
securityContext:
334+
fsGroup: 1000
297335
serviceAccount: hive-serviceaccount
298336
serviceAccountName: hive-serviceaccount
299337
terminationGracePeriodSeconds: 300

0 commit comments

Comments
 (0)