Skip to content

feat: promql tenant id #1740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2025
Merged

feat: promql tenant id #1740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions charts/k8s-monitoring-test/query-test/query-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ usage() {
echo " PROFILECLI_USERNAME - The username for running Pyroscope queries"
echo " PROFILECLI_PASSWORD - The password for running Pyroscope queries"
echo
echo "Optional environment variables:"
echo " If using any PromQL queries:"
echo " PROMETHEUS_TENANTID - The tenant ID for running PromQL queries"
echo
echo "queries.json is the queries file, and should be in the format:"
echo '{"queries": [<query>]}'
echo
Expand Down Expand Up @@ -98,7 +102,12 @@ function metrics_query {
fi

echo "Running PromQL query: ${PROMETHEUS_URL}?query=${query}..."
result=$(curl -skX POST -u "${PROMETHEUS_USER}:${PROMETHEUS_PASS}" "${PROMETHEUS_URL}" --data-urlencode "query=${query}")
if [ -z "${PROMETHEUS_TENANTID}" ]; then
additionalRequestOptions=""
else
additionalRequestOptions="-H X-Scope-OrgID:${PROMETHEUS_TENANTID}"
fi
result=$(curl -v -kX POST $additionalRequestOptions -u "${PROMETHEUS_USER}:${PROMETHEUS_PASS}" "${PROMETHEUS_URL}" --data-urlencode "query=${query}")
status=$(echo "${result}" | jq -r .status)
if [ "${status}" != "success" ]; then
echo "Query failed!"
Expand Down Expand Up @@ -204,4 +213,4 @@ for i in $(seq 0 "${count}"); do
esac
done

echo "All queries passed!"
echo "All queries passed!"
Loading