Pings with numbers

orta · orta · commit 34ae3fa69dc0 · 2020-11-17T15:40:46.000-05:00
diff --git a/.github/workflows/weekly-stats.yml b/.github/workflows/weekly-stats.yml
@@ -0,0 +1,38 @@
+name: Push AI stats to Teams
+
+on:
+  schedule:
+    # https://crontab.guru/#0_12_*_*_1
+    - cron: "0 12 * * 1"
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+
+      # Build v2
+      - name: Deps
+        run: |
+          yarn install
+        env:
+          YARN_CHECKSUM_BEHAVIOR: ignore
+
+      # Update the site stats
+      - run: node packages/typescriptlang-org/scripts/pingTeamsWithAppInsightData.js
+        env:
+          APP_INSIGHTS_API_KEY: ${{ secrets.APP_INSIGHTS_API_KEY }}
+          APP_INSIGHTS_ID: ${{ secrets.APP_INSIGHTS_ID }}
+          STATS_WEBHOOK_INCOMING_URL: ${{ secrets.STATS_WEBHOOK_INCOMING_URL }}
+
+      - name: Send a message to Microsoft Teams
+        if: ${{ failure() }}
+        uses: aliencube/microsoft-teams-actions@v0.8.0
+        with:
+          webhook_uri: ${{ secrets.TEAMS_WEB_BOT_INCOMING_URL }}
+          title: Updating site stats failed
+          summary: Something failed in the GitHub Action workflow
+          actions: '[{ "@type": "OpenUri", "name": "View Logs", "targets": [{ "os": "default", "uri": "https://github.com/microsoft/TypeScript-Website/actions/runs/${{ github.run_id }}?check_suite_focus=true" }] }]'
diff --git a/packages/typescriptlang-org/scripts/pingTeamsWithAppInsightData.js b/packages/typescriptlang-org/scripts/pingTeamsWithAppInsightData.js
@@ -3,15 +3,15 @@
  *
  * run with:
     APP_INSIGHTS_ID="X" APP_INSIGHTS_API_KEY="Y" node packages/typescriptlang-org/scripts/pingTeamsWithAppInsightData.js
+
+   if process.env.STATS_WEBHOOK_INCOMING_URL is set, then the message will go into teams 
   */
 
 const nodeFetch = require("node-fetch").default
 const querystring = require("querystring")
 
 const go = async () => {
   const dl = await getDetailsForDownloadIntention()
-  console.log({ dl })
-  return
 
   // Sessions
   const all = await getCountForSessions()
@@ -30,7 +30,7 @@ const go = async () => {
   // Users
   const allUsers = await getCountForQuery(getUsersAllPrefixed())
 
-  // console.log({ allUsers, all, index, playground, handbook })
+  // https://adaptivecards.io/designer
 
   const headline = {
     type: "FactSet",
@@ -44,12 +44,16 @@ const go = async () => {
         value: comma(allUsers),
       },
       {
-        title: "Homepage",
+        title: "Homepage Sessions",
         value: comma(index),
       },
     ],
   }
 
+  const homepageSection = makeColumn("Download", {
+    All: comma(dl),
+  })
+
   const playgroundSection = makeColumn("Playground Usage", {
     All: comma(playground),
   })
@@ -71,12 +75,39 @@ const go = async () => {
       headline,
       {
         type: "ColumnSet",
-        columns: [playgroundSection, handbookSection, jsInTSSection],
+        columns: [
+          homepageSection,
+          playgroundSection,
+          handbookSection,
+          jsInTSSection,
+        ],
       },
     ],
   }
 
-  console.log(JSON.stringify(card))
+  if (!process.env.STATS_WEBHOOK_INCOMING_URL) {
+    console.log(JSON.stringify(card, null, "  "))
+  } else {
+    // https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/connectors-using#send-adaptive-cards-using-an-incoming-webhook
+
+    const outer = {
+      type: "message",
+      attachments: [
+        {
+          contentType: "application/vnd.microsoft.card.adaptive",
+          contentUrl: null,
+          content: card,
+        },
+      ],
+    }
+
+    const r = await nodeFetch(process.env.STATS_WEBHOOK_INCOMING_URL, {
+      method: "post",
+      body: JSON.stringify(outer),
+      headers: { "Content-Type": "application/json" },
+    })
+    console.log(r)
+  }
 }
 
 go()
@@ -182,8 +213,7 @@ async function getDetailsForDownloadIntention() {
       | make-series Sessions = dcount(session_Id) default = 0 on timestamp from ago(7d) to now() step iff(true, 7d, 7d)`
 
   const response = await makeQuery(query)
-  console.log(response.tables[0].rows)
-  return {}
+  return JSON.parse(response.tables[0].rows[0][0])[0]
 }
 
 function comma(x) {
diff --git a/packages/typescriptlang-org/src/templates/pages/index.scss b/packages/typescriptlang-org/src/templates/pages/index.scss
@@ -397,7 +397,7 @@ $headline-foreground-bg: #104261;
             }
             .error {
               background-color: #341c2c;
-              color: #cf1616;
+              color: #ee5858;
             }
           }
 

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ $headline-foreground-bg: #104261;`
`397`	`397`	`}`
`398`	`398`	`.error {`
`399`	`399`	`background-color: #341c2c;`
`400`		`- color: #cf1616;`
	`400`	`+ color: #ee5858;`
`401`	`401`	`}`
`402`	`402`	`}`
`403`	`403`