diff --git a/.github/scripts/event_stats.sh b/.github/scripts/event_stats.sh index 4ba2a91..5ed92ea 100644 --- a/.github/scripts/event_stats.sh +++ b/.github/scripts/event_stats.sh @@ -8,6 +8,19 @@ echo "Total launches: $(kubectl exec -n $NAMESPACE galaxy-$RELEASE-postgres-0 -- echo "Total users: $(kubectl exec -n $NAMESPACE galaxy-$RELEASE-postgres-0 -- bash -c "psql -d galaxy -U galaxydbuser -c \"select count(DISTINCT j.user_id) from job j where j.tool_id like '%_%$EVENT%';\"" | sed '3q;d' | tr -d ' ')" printf "\nSummary:\n\n| TOOL_ID | NUM LAUNCHES | NUM USERS |\n|-----------|--------------|-----------|\n" -kubectl exec -n $NAMESPACE galaxy-$RELEASE-postgres-0 -- bash -c "psql -d galaxy -U galaxydbuser -c \"COPY(SELECT tool_id, COUNT(DISTINCT id) AS num_jobs, COUNT(DISTINCT user_id) AS num_users FROM job GROUP BY tool_id) TO STDOUT;\"" | grep "$EVENT" | sed 's/interactivetool_biocworkshop_//g' | sed 's/\s\+/,/g' | sed -e 's/^/| /' -e 's/,/ | /g' -e 's/$/ |/' +kubectl exec -n $NAMESPACE galaxy-$RELEASE-postgres-0 -- bash -c "psql -d galaxy -U galaxydbuser -c \"COPY(SELECT tool_id, COUNT(DISTINCT id) AS num_jobs, COUNT(DISTINCT user_id) AS num_users FROM job GROUP BY tool_id) TO STDOUT;\"" | grep "$EVENT" | sed 's/interactivetool_biocworkshop_//g' | sed 's/\s\+/,/g' | sed -e 's/^/| /' -e 's/,/ | /g' -e 's/$/ |/' > /tmp/summarytable +helm get values -n $NAMESPACE $RELEASE | grep 'extraFileMappings' -A100000 > /tmp/gxyvals + +cat /tmp/summarytable | awk -F'|' '{print $2}' > /tmp/tool_ids + +cat /tmp/tool_ids | xargs -i bash -c "cat /tmp/gxyvals | grep 'interactivetool_biocworkshop_{}' -A4 | grep 'tool_type' | grep -oP '(?<=name=\")[^\"]*'" > /tmp/tool_names + +rm /tmp/gxyvals + +paste -d'\t' /tmp/tool_ids /tmp/tool_names | awk -F'\t' '{print "s#" $1 "#" $2 "#g"}' > /tmp/sed_commands + +xargs -a /tmp/sed_commands -I{} sed -i -e '{}' /tmp/tablesummary + +cat /tmp/tablesummary diff --git a/.github/workflows/event-stats.yaml b/.github/workflows/event-stats.yaml index 79e61ed..b2c5c5b 100644 --- a/.github/workflows/event-stats.yaml +++ b/.github/workflows/event-stats.yaml @@ -18,7 +18,8 @@ jobs: run: | EVENTINPUT=${{ github.event.client_payload.slash_command.args.named.event || 'error' }} echo event=$EVENTINPUT >> $GITHUB_OUTPUT - + - name: Install Helm + run: curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash - name: save kubeconfig shell: bash run: mkdir -p ~/.kube && echo "${{ secrets.TEST_KUBECONFIG }}" > ~/.kube/config