refactor metrics push into action

Author: nocturnalnematode

.github/actions/pushLoggedMetrics/action.yml

@@ -0,0 +1,61 @@
+name: Push logged metrics
+description: Push logged metrics
+inputs:
+  metricsKey:
+    description: Private key for signing messages
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Do it
+      continue-on-error: true
+      shell: bash
+      run: |
+        export SFPOWERSCRIPTS_STATSD=true
+        echo "statsd: $SFPOWERSCRIPTS_STATSD"
+        bash -c 'echo "statsd: $SFPOWERSCRIPTS_STATSD"'
+        sfp pool prepare --poolconfig "${{ matrix.pool.poolConfigPath }}" --targetdevhubusername devhub
+        if [[ -f .sfpowerscripts/logs/metrics.log ]]; then
+          # send some stats whilst we're at it
+          echo Metrics file found.
+          nl .sfpowerscripts/logs/metrics.log
+          metrics=$(jq --slurp --raw-output '
+          [
+              .[] | select(.value != null)
+          ] |
+              # just keep the last value
+              reverse | unique_by(.metric, .tags) |
+              group_by(.type)[][] |
+              (
+                  if .type == "count" then "counter"
+                  # note the spelling
+                  elif .type == "guage" then "gauge"
+                  # statsd-timers are always in ms. prometheus has no such type, so just
+                  # use a gauge
+                  elif .type == "timers" then "gauge"
+                  # anything else, handle it when the time comes
+                  else "unknown" end) as $type |
+              # only allow alpha and _ in metrics name
+              (.metric | gsub("[^a-z]"; "_")) as $metric |
+              # transform tags into prometheus
+              (.tags // {} | to_entries | map(.key + "=\"" + .value + "\"") | join(",")) as $tags |
+              # put it all together. one line with description, one line with metric.
+              "# TYPE \($metric) \($type)\n\($metric){\($tags)} \(.value)"
+          ' .sfpowerscripts/logs/metrics.log | awk '/^# TYPE / && a[$3]++ {next}; 1')
+          echo "METRICSKEY len: ${#METRICSKEY}"
+          keyfile=$(mktemp) || exit 1
+          cat > "$keyfile" <<< "$METRICSKEY"
+          sig=$(printf %s "$metrics" | openssl dgst -sha256 -sign "$keyfile" -out - | base64 -w0)
+          jq --compact-output --null-input \
+            --arg metrics "$metrics" \
+            --arg runner sf-platform \
+            --arg sig "$sig" \
+            '{"runner":$runner,"metrics":$metrics,"signature":$sig}' |
+            tee >(curl -D- -H 'Content-Type: application/json' --data-binary @- \
+              https://sf-github-metrics.ekstern.dev.nav.no/measures/job/sfplatform)
+        else
+          echo No metrics file this time.
+          ls -laR .sfpowerscripts
+        fi
+      env:
+        METRICSKEY: ${{ inputs.metricsKey }}

.github/workflows/ciCreatePlatformPool.yml

@@ -194,58 +194,17 @@ jobs:
           deleteJobType: ${{ matrix.pool.deleteJobType }}
           isCiPool: ${{ matrix.pool.isCiPool }}
 
-      - name: "Create Pool, push metrics"
+      - name: "Create Pool"
         run: |
-          export SFPOWERSCRIPTS_STATSD=true
-          echo "statsd: $SFPOWERSCRIPTS_STATSD"
-          bash -c 'echo "statsd: $SFPOWERSCRIPTS_STATSD"'
           sfp pool prepare --poolconfig "${{ matrix.pool.poolConfigPath }}" --targetdevhubusername devhub
-          if [[ -f .sfpowerscripts/logs/metrics.log ]]; then
-            # send some stats whilst we're at it
-            echo Metrics file found.
-            nl .sfpowerscripts/logs/metrics.log
-            metrics=$(jq --slurp --raw-output '
-            [
-                .[] | select(.value != null)
-            ] |
-                # just keep the last value
-                reverse | unique_by(.metric, .tags) |
-                group_by(.type)[][] |
-                (
-                    if .type == "count" then "counter"
-                    # note the spelling
-                    elif .type == "guage" then "gauge"
-                    # statsd-timers are always in ms. prometheus has no such type, so just
-                    # use a gauge
-                    elif .type == "timers" then "gauge"
-                    # anything else, handle it when the time comes
-                    else "unknown" end) as $type |
-                # only allow alpha and _ in metrics name
-                (.metric | gsub("[^a-z]"; "_")) as $metric |
-                # transform tags into prometheus
-                (.tags // {} | to_entries | map(.key + "=\"" + .value + "\"") | join(",")) as $tags |
-                # put it all together. one line with description, one line with metric.
-                "# TYPE \($metric) \($type)\n\($metric){\($tags)} \(.value)"
-            ' .sfpowerscripts/logs/metrics.log | awk '/^# TYPE / && a[$3]++ {next}; 1')
-            echo "METRICSKEY len: ${#METRICSKEY}"
-            keyfile=$(mktemp) || exit 1
-            cat > "$keyfile" <<< "$METRICSKEY"
-            sig=$(printf %s "$metrics" | openssl dgst -sha256 -sign "$keyfile" -out - | base64 -w0)
-            jq --compact-output --null-input \
-              --arg metrics "$metrics" \
-              --arg runner sf-platform \
-              --arg sig "$sig" \
-              '{"runner":$runner,"metrics":$metrics,"signature":$sig}' |
-              tee >(curl -D- -H 'Content-Type: application/json' --data-binary @- \
-                https://sf-github-metrics.ekstern.dev.nav.no/measures/job/sfplatform)
-          else
-            echo No metrics file this time.
-            ls -laR .sfpowerscripts
-          fi
         env:
-          METRICSKEY: ${{ secrets.METRICS_KEYS }}
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Push logged metrics
+        uses: navikt/sf-platform/.github/actions/pushLoggedMetrics@main
+        with:
+          metricsKey: ${{ secrets.METRICS_KEYS }}
+
       - name: "Delete orphans"
         uses: navikt/sf-gha-deleteScratchPool@1f0986d2312a2969e658946acb496f6dcd7d4032
         with: