Merge branch 'master' into feat/alerts-posthog

PostHog · Nov 26, 2024 · 137ba1c · 137ba1c
2 parents 716f604 + 7a347c3
commit 137ba1c
Show file tree

Hide file tree

Showing 365 changed files with 10,176 additions and 6,526 deletions.
diff --git a/.github/actions/run-backend-tests/action.yml b/.github/actions/run-backend-tests/action.yml
@@ -210,7 +210,7 @@ runs:
 
         - name: Upload updated timing data as artifacts
           uses: actions/upload-artifact@v4
-          if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:23.12.6.19' }}
+          if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:24.8.7.41' }}
           with:
               name: timing_data-${{ inputs.segment }}-${{ inputs.group }}
               path: .test_durations

diff --git a/.github/workflows/ci-backend-update-test-timing.yml b/.github/workflows/ci-backend-update-test-timing.yml
@@ -29,13 +29,13 @@ jobs:
                   group: 1
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
                   python-version: '3.11.9'
-                  clickhouse-server-image: 'clickhouse/clickhouse-server:23.12.6.19'
+                  clickhouse-server-image: 'clickhouse/clickhouse-server:24.8.7.41'
                   segment: 'FOSS'
                   person-on-events: false
 
             - name: Upload updated timing data as artifacts
               uses: actions/upload-artifact@v4
-              if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:23.12.6.19' }}
+              if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:24.8.7.41' }}
               with:
                   name: timing_data-${{ inputs.segment }}-${{ inputs.group }}
                   path: .test_durations

diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
@@ -234,7 +234,7 @@ jobs:
             fail-fast: false
             matrix:
                 python-version: ['3.11.9']
-                clickhouse-server-image: ['clickhouse/clickhouse-server:23.12.6.19']
+                clickhouse-server-image: ['clickhouse/clickhouse-server:24.8.7.41']
                 segment: ['Core']
                 person-on-events: [false, true]
                 # :NOTE: Keep concurrency and groups in sync
@@ -243,19 +243,19 @@ jobs:
                 include:
                     - segment: 'Temporal'
                       person-on-events: false
-                      clickhouse-server-image: 'clickhouse/clickhouse-server:23.12.6.19'
+                      clickhouse-server-image: 'clickhouse/clickhouse-server:24.8.7.41'
                       python-version: '3.11.9'
                       concurrency: 3
                       group: 1
                     - segment: 'Temporal'
                       person-on-events: false
-                      clickhouse-server-image: 'clickhouse/clickhouse-server:23.12.6.19'
+                      clickhouse-server-image: 'clickhouse/clickhouse-server:24.8.7.41'
                       python-version: '3.11.9'
                       concurrency: 3
                       group: 2
                     - segment: 'Temporal'
                       person-on-events: false
-                      clickhouse-server-image: 'clickhouse/clickhouse-server:23.12.6.19'
+                      clickhouse-server-image: 'clickhouse/clickhouse-server:24.8.7.41'
                       python-version: '3.11.9'
                       concurrency: 3
                       group: 3
@@ -326,7 +326,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                clickhouse-server-image: ['clickhouse/clickhouse-server:23.12.6.19']
+                clickhouse-server-image: ['clickhouse/clickhouse-server:24.8.7.41']
         if: needs.changes.outputs.backend == 'true'
         runs-on: ubuntu-latest
         steps:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -190,6 +190,23 @@
             "purpose": ["debug-test"],
             "console": "integratedTerminal",
             "justMyCode": false
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Jest Current File",
+            "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
+            "args": ["--detectOpenHandles", "${relativeFile}"],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "runtimeExecutable": "${env:HOME}/.nvm/versions/node/${input:pickVersion}/bin/node"
+        }
+    ],
+    "inputs": [
+        {
+            "id": "pickVersion",
+            "type": "command",
+            "command": "extension.node-version"
         }
     ],
     "compounds": [

diff --git a/cypress/e2e/persons.cy.ts b/cypress/e2e/persons.cy.ts
@@ -13,7 +13,10 @@ describe('Persons', () => {
     it('Deleting person from list', () => {
         cy.get('[data-attr=persons-search]').type('hodge').type('{enter}')
         cy.contains('tr', '[email protected]').find('[data-attr=delete-person]').click()
-        cy.get('h3').should('have.text', 'Are you sure you want to delete "[email protected]"?')
+        cy.get('.LemonModal__header h3').should(
+            'have.text',
+            'Are you sure you want to delete "[email protected]"?'
+        )
         cy.get('label').contains('I understand').click() // Acknowledge deletion
         cy.get('.LemonButton--secondary').contains('Delete person').click()
         cy.get('.Toastify__toast-body').contains('[email protected] was removed from the project')

diff --git a/docker-compose.base.yml b/docker-compose.base.yml
@@ -79,7 +79,7 @@ services:
         # Note: please keep the default version in sync across
         #       `posthog` and the `charts-clickhouse` repos
         #
-        image: ${CLICKHOUSE_SERVER_IMAGE:-clickhouse/clickhouse-server:23.12.6.19}
+        image: ${CLICKHOUSE_SERVER_IMAGE:-clickhouse/clickhouse-server:24.8.7.41}
         restart: on-failure
 
     zookeeper:

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -57,6 +57,7 @@ services:
             service: clickhouse
         ports:
             - '8123:8123'
+            - '8443:8443'
             - '9000:9000'
             - '9440:9440'
             - '9009:9009'