From fb7b444f68ae6571ad9ecb56f6eba51539c14924 Mon Sep 17 00:00:00 2001 From: Steve Larson <9larsons@gmail.com> Date: Thu, 6 Mar 2025 14:52:29 -0600 Subject: [PATCH] Updated web analytics assets & tests (#22409) no ref - rebuilt the Tinybird datafiles - fixed tests - changed structure to use includes for the hits pipe We needed passing tests in order to get the Deploy function to actually work, plus we needed this pointing to our staging instance. We'll need to later hook it up to push to production as well using some mechanism. --------- Co-authored-by: Chris Raible --- .github/workflows/ci.yml | 12 +++--- .../datasources/_mv_pages.datasource | 2 + .../datasources/_mv_sessions.datasource | 2 + .../datasources/_mv_sources.datasource | 2 + .../datasources/analytics_events.datasource | 5 +-- .../pipes/{_hits.pipe => _hits.incl} | 26 ++----------- ghost/web-analytics/pipes/_parsed_hits.incl | 25 +++++++++++++ ghost/web-analytics/pipes/api_kpis.pipe | 37 +++++++++++++++---- .../web-analytics/pipes/api_top_browsers.pipe | 3 ++ .../web-analytics/pipes/api_top_devices.pipe | 3 ++ .../pipes/api_top_locations.pipe | 3 ++ ghost/web-analytics/pipes/api_top_os.pipe | 3 ++ ghost/web-analytics/pipes/api_top_pages.pipe | 3 ++ .../web-analytics/pipes/api_top_sources.pipe | 3 ++ ghost/web-analytics/pipes/mv_pages.pipe | 7 +++- ghost/web-analytics/pipes/mv_sessions.pipe | 7 +++- ghost/web-analytics/pipes/mv_sources.pipe | 11 ++++-- ghost/web-analytics/requirements.txt | 2 +- .../web-analytics/scripts/branch_and_test.sh | 1 + ghost/web-analytics/tests/all_kpis.test | 2 +- .../web-analytics/tests/all_top_browsers.test | 2 +- .../web-analytics/tests/all_top_devices.test | 2 +- .../tests/all_top_locations.test | 2 +- ghost/web-analytics/tests/all_top_pages.test | 2 +- .../web-analytics/tests/all_top_sources.test | 2 +- .../tests/date_range_one_day_kpis.test | 2 +- .../tests/filter_browser_chrome_kpis.test | 2 +- .../filter_browser_chrome_top_browsers.test | 2 +- .../filter_browser_chrome_top_pages.test | 2 +- .../filter_browser_chrome_top_sources.test | 2 +- .../tests/filter_source_bing_kpis.test | 2 +- .../filter_source_bing_top_browsers.test | 2 +- .../tests/filter_source_bing_top_pages.test | 2 +- .../tests/filter_source_bing_top_sources.test | 2 +- 34 files changed, 127 insertions(+), 60 deletions(-) rename ghost/web-analytics/pipes/{_hits.pipe => _hits.incl} (65%) create mode 100644 ghost/web-analytics/pipes/_parsed_hits.incl diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3043dbefa9..cfada47f9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -908,15 +908,15 @@ jobs: - name: Check all the datafiles syntax run: tb check - name: Check auth - run: tb --host=${{ secrets.TB_HOST }} --token=${{ secrets.TB_ADMIN_TOKEN }} auth info + run: tb --host=${{ secrets.TB_HOST }} --token=${{ secrets.TB_ADMIN_TOKEN_STAGING }} auth info - name: Try to delete previous Branch run: | - output=$(tb --host ${{ secrets.TB_HOST }} --token ${{ secrets.TB_ADMIN_TOKEN }} branch ls) + output=$(tb --host ${{ secrets.TB_HOST }} --token ${{ secrets.TB_ADMIN_TOKEN_STAGING }} branch ls) # Check if the branch name exists in the output if echo "$output" | grep -q "\b$TB_BRANCH_NAME\b"; then tb \ --host ${{ secrets.TB_HOST }} \ - --token ${{ secrets.TB_ADMIN_TOKEN }} \ + --token ${{ secrets.TB_ADMIN_TOKEN_STAGING }} \ branch rm $TB_BRANCH_NAME \ --yes else @@ -926,7 +926,7 @@ jobs: run: | tb \ --host ${{ secrets.TB_HOST }} \ - --token ${{ secrets.TB_ADMIN_TOKEN }} \ + --token ${{ secrets.TB_ADMIN_TOKEN_STAGING }} \ branch create $TB_BRANCH_NAME \ ${_ENV_FLAGS} - name: Deploy changes to the test Branch @@ -967,12 +967,12 @@ jobs: - name: Try to delete previous Branch if: always() run: | - output=$(tb --host ${{ secrets.TB_HOST }} --token ${{ secrets.TB_ADMIN_TOKEN }} branch ls) + output=$(tb --host ${{ secrets.TB_HOST }} --token ${{ secrets.TB_ADMIN_TOKEN_STAGING }} branch ls) # Check if the branch name exists in the output if echo "$output" | grep -q "\b$TB_BRANCH_NAME\b"; then tb \ --host ${{ secrets.TB_HOST }} \ - --token ${{ secrets.TB_ADMIN_TOKEN }} \ + --token ${{ secrets.TB_ADMIN_TOKEN_STAGING }} \ branch rm $TB_BRANCH_NAME \ --yes else diff --git a/ghost/web-analytics/datasources/_mv_pages.datasource b/ghost/web-analytics/datasources/_mv_pages.datasource index eea1c80ccc..2611a0cb95 100644 --- a/ghost/web-analytics/datasources/_mv_pages.datasource +++ b/ghost/web-analytics/datasources/_mv_pages.datasource @@ -1,5 +1,7 @@ VERSION 0 +TAGS "v0" + SCHEMA > `site_uuid` String, `post_uuid` String, diff --git a/ghost/web-analytics/datasources/_mv_sessions.datasource b/ghost/web-analytics/datasources/_mv_sessions.datasource index 188a44ee43..4d289f4f30 100644 --- a/ghost/web-analytics/datasources/_mv_sessions.datasource +++ b/ghost/web-analytics/datasources/_mv_sessions.datasource @@ -1,5 +1,7 @@ VERSION 0 +TAGS "v0" + SCHEMA > `site_uuid` String, `date` Date, diff --git a/ghost/web-analytics/datasources/_mv_sources.datasource b/ghost/web-analytics/datasources/_mv_sources.datasource index 6586c44a0a..8a2ba1bbff 100644 --- a/ghost/web-analytics/datasources/_mv_sources.datasource +++ b/ghost/web-analytics/datasources/_mv_sources.datasource @@ -1,5 +1,7 @@ VERSION 0 +TAGS "v0" + SCHEMA > `site_uuid` String, `date` Date, diff --git a/ghost/web-analytics/datasources/analytics_events.datasource b/ghost/web-analytics/datasources/analytics_events.datasource index fa6719cb0d..374fa88b04 100644 --- a/ghost/web-analytics/datasources/analytics_events.datasource +++ b/ghost/web-analytics/datasources/analytics_events.datasource @@ -1,9 +1,6 @@ TOKEN "tracker" APPEND -TOKEN "analytics_events_json_m" APPEND - -TOKEN "analytics_events_json_s" APPEND - +TAGS "v0" SCHEMA > `timestamp` DateTime `json:$.timestamp`, diff --git a/ghost/web-analytics/pipes/_hits.pipe b/ghost/web-analytics/pipes/_hits.incl similarity index 65% rename from ghost/web-analytics/pipes/_hits.pipe rename to ghost/web-analytics/pipes/_hits.incl index b4bf6f0a07..192600ffd9 100644 --- a/ghost/web-analytics/pipes/_hits.pipe +++ b/ghost/web-analytics/pipes/_hits.incl @@ -1,27 +1,10 @@ VERSION 0 -NODE parsed_hits -SQL > - SELECT - timestamp, - action, - version, - coalesce(session_id, '0') as session_id, - toString(payload.locale) as locale, - toString(payload.location) as location, - toString(payload.referrer) as referrer, - toString(payload.pathname) as pathname, - toString(payload.href) as href, - site_uuid, - toString(payload.member_uuid) as member_uuid, - toString(payload.member_status) as member_status, - toString(payload.post_uuid) as post_uuid, - toString(payload.post_type) as post_type, - lower(toString(getSubcolumn(payload,'user-agent'))) as user_agent - FROM analytics_events - where action = 'page_hit' +TAGS "v0" -NODE _hits +INCLUDE "_parsed_hits.incl" + +NODE hits SQL > SELECT @@ -71,4 +54,3 @@ SQL > END as browser FROM parsed_hits - diff --git a/ghost/web-analytics/pipes/_parsed_hits.incl b/ghost/web-analytics/pipes/_parsed_hits.incl new file mode 100644 index 0000000000..162ce44272 --- /dev/null +++ b/ghost/web-analytics/pipes/_parsed_hits.incl @@ -0,0 +1,25 @@ +VERSION 0 + +TAGS "v0" + +NODE parsed_hits +SQL > + + SELECT + timestamp, + action, + version, + coalesce(session_id, '0') as session_id, + toString(payload.locale) as locale, + toString(payload.location) as location, + toString(payload.referrer) as referrer, + toString(payload.pathname) as pathname, + toString(payload.href) as href, + site_uuid, + toString(payload.member_uuid) as member_uuid, + toString(payload.member_status) as member_status, + toString(payload.post_uuid) as post_uuid, + toString(payload.post_type) as post_type, + lower(toString(getSubcolumn(payload,'user-agent'))) as user_agent + FROM analytics_events + where action = 'page_hit' \ No newline at end of file diff --git a/ghost/web-analytics/pipes/api_kpis.pipe b/ghost/web-analytics/pipes/api_kpis.pipe index 168348ba8d..7f516261b6 100644 --- a/ghost/web-analytics/pipes/api_kpis.pipe +++ b/ghost/web-analytics/pipes/api_kpis.pipe @@ -1,4 +1,9 @@ VERSION 0 + +TAGS "v0" + +INCLUDE "_parsed_hits.incl" + NODE timeseries SQL > @@ -65,17 +70,37 @@ SQL > toStartOfHour(timestamp) as date, session_id, member_status, - device, - browser, + case + when match(user_agent, 'wget|ahrefsbot|curl|urllib|bitdiscovery|\+https://|googlebot') + then 'bot' + when match(user_agent, 'android') + then 'mobile-android' + when match(user_agent, 'ipad|iphone|ipod') + then 'mobile-ios' + else 'desktop' + END as device, + case + when match(user_agent, 'firefox') + then 'firefox' + when match(user_agent, 'chrome|crios') + then 'chrome' + when match(user_agent, 'opera') + then 'opera' + when match(user_agent, 'msie|trident') + then 'ie' + when match(user_agent, 'iphone|ipad|safari') + then 'safari' + else 'Unknown' + END as browser, location, - source, + domainWithoutWWW(referrer) as source, pathname, uniq(session_id) as visits, count() as pageviews, case when min(timestamp) = max(timestamp) then 1 else 0 end as is_bounce, max(timestamp) as latest_view_aux, min(timestamp) as first_view_aux - from _hits + from parsed_hits where toDate(timestamp) = {{ Date(date_from) }} group by toStartOfHour(timestamp), session_id, site_uuid, member_status, device, browser, location, source, pathname {% else %} @@ -135,6 +160,4 @@ SQL > select a.date, b.visits, b.pageviews, b.bounce_rate, b.avg_session_sec from timeseries a - left join data b using date - - + left join data b using date \ No newline at end of file diff --git a/ghost/web-analytics/pipes/api_top_browsers.pipe b/ghost/web-analytics/pipes/api_top_browsers.pipe index 3e83f4632f..2981a02c39 100644 --- a/ghost/web-analytics/pipes/api_top_browsers.pipe +++ b/ghost/web-analytics/pipes/api_top_browsers.pipe @@ -1,4 +1,7 @@ VERSION 0 + +TAGS "v0" + NODE _top_browsers_0 SQL > diff --git a/ghost/web-analytics/pipes/api_top_devices.pipe b/ghost/web-analytics/pipes/api_top_devices.pipe index 52d542b574..f24220ca4c 100644 --- a/ghost/web-analytics/pipes/api_top_devices.pipe +++ b/ghost/web-analytics/pipes/api_top_devices.pipe @@ -1,4 +1,7 @@ VERSION 0 + +TAGS "v0" + NODE _top_devices_0 SQL > diff --git a/ghost/web-analytics/pipes/api_top_locations.pipe b/ghost/web-analytics/pipes/api_top_locations.pipe index 32221ad4e6..cf480b4721 100644 --- a/ghost/web-analytics/pipes/api_top_locations.pipe +++ b/ghost/web-analytics/pipes/api_top_locations.pipe @@ -1,4 +1,7 @@ VERSION 0 + +TAGS "v0" + NODE _top_locations_0 SQL > diff --git a/ghost/web-analytics/pipes/api_top_os.pipe b/ghost/web-analytics/pipes/api_top_os.pipe index ff752ec76f..db6fa4d82c 100644 --- a/ghost/web-analytics/pipes/api_top_os.pipe +++ b/ghost/web-analytics/pipes/api_top_os.pipe @@ -1,4 +1,7 @@ VERSION 0 + +TAGS "v0" + DESCRIPTION > Top Operating Systems ordered by most visits. Accepts `date_from` and `date_to` date filter. Defaults to last 7 days. diff --git a/ghost/web-analytics/pipes/api_top_pages.pipe b/ghost/web-analytics/pipes/api_top_pages.pipe index fb1a18b437..e06bc5769a 100644 --- a/ghost/web-analytics/pipes/api_top_pages.pipe +++ b/ghost/web-analytics/pipes/api_top_pages.pipe @@ -1,4 +1,7 @@ VERSION 0 + +TAGS "v0" + NODE _top_pages_0 SQL > diff --git a/ghost/web-analytics/pipes/api_top_sources.pipe b/ghost/web-analytics/pipes/api_top_sources.pipe index 70e989c2ed..6dff5a30e5 100644 --- a/ghost/web-analytics/pipes/api_top_sources.pipe +++ b/ghost/web-analytics/pipes/api_top_sources.pipe @@ -1,4 +1,7 @@ VERSION 0 + +TAGS "v0" + TOKEN "_top_sources_endpoint_read_1325" READ NODE _top_sources_0 diff --git a/ghost/web-analytics/pipes/mv_pages.pipe b/ghost/web-analytics/pipes/mv_pages.pipe index 7e1443109e..9081b49bd6 100644 --- a/ghost/web-analytics/pipes/mv_pages.pipe +++ b/ghost/web-analytics/pipes/mv_pages.pipe @@ -1,4 +1,9 @@ VERSION 0 + +TAGS "v0" + +INCLUDE "_hits.incl" + NODE _pages_0 SQL > @@ -16,7 +21,7 @@ SQL > maxIfState(member_status, member_status IN ('paid', 'free', 'undefined')) AS member_status, uniqState(session_id) AS visits, countState() AS pageviews - FROM _hits + FROM hits GROUP BY site_uuid, date, diff --git a/ghost/web-analytics/pipes/mv_sessions.pipe b/ghost/web-analytics/pipes/mv_sessions.pipe index 6f4a5cd1f1..3bd46c9e48 100644 --- a/ghost/web-analytics/pipes/mv_sessions.pipe +++ b/ghost/web-analytics/pipes/mv_sessions.pipe @@ -1,4 +1,9 @@ VERSION 0 + +TAGS "v0" + +INCLUDE "_hits.incl" + NODE _sessions_0 SQL > @@ -19,7 +24,7 @@ SQL > maxSimpleState(timestamp) AS latest_view, countState() AS pageviews - FROM _hits + FROM hits GROUP BY site_uuid, date, diff --git a/ghost/web-analytics/pipes/mv_sources.pipe b/ghost/web-analytics/pipes/mv_sources.pipe index c4e735fc6b..4062432f27 100644 --- a/ghost/web-analytics/pipes/mv_sources.pipe +++ b/ghost/web-analytics/pipes/mv_sources.pipe @@ -1,11 +1,16 @@ VERSION 0 + +TAGS "v0" + +INCLUDE "_hits.incl" + NODE _sources_0 SQL > WITH ( SELECT domainWithoutWWW(href) - FROM _hits + FROM hits LIMIT 1 ) AS current_domain, sessions AS @@ -14,7 +19,7 @@ SQL > session_id, argMin(source, timestamp) AS source, maxIfState(member_status, member_status IN ('paid', 'free', 'undefined')) AS member_status - FROM _hits + FROM hits GROUP BY session_id ) SELECT @@ -33,7 +38,7 @@ SQL > uniqState(a.session_id) AS visits, countState() AS pageviews - FROM _hits AS a + FROM hits AS a INNER JOIN sessions AS b ON a.session_id = b.session_id GROUP BY a.site_uuid, diff --git a/ghost/web-analytics/requirements.txt b/ghost/web-analytics/requirements.txt index 86035df960..c84f678440 100644 --- a/ghost/web-analytics/requirements.txt +++ b/ghost/web-analytics/requirements.txt @@ -1 +1 @@ -tinybird-cli>=4,<5 \ No newline at end of file +tinybird-cli>=5.17.0 \ No newline at end of file diff --git a/ghost/web-analytics/scripts/branch_and_test.sh b/ghost/web-analytics/scripts/branch_and_test.sh index ac8de7af91..9c574458d8 100755 --- a/ghost/web-analytics/scripts/branch_and_test.sh +++ b/ghost/web-analytics/scripts/branch_and_test.sh @@ -19,6 +19,7 @@ done # Allow version to be passed in or default to 0 export TB_VERSION=${TB_VERSION:-0} +echo "Using TB_VERSION: $TB_VERSION" # Attempt to create the branch and check for errors if ! tb branch create "$BRANCH_NAME"; then diff --git a/ghost/web-analytics/tests/all_kpis.test b/ghost/web-analytics/tests/all_kpis.test index 5203e5adb5..dbb45f23af 100644 --- a/ghost/web-analytics/tests/all_kpis.test +++ b/ghost/web-analytics/tests/all_kpis.test @@ -1 +1 @@ -tb pipe data kpis__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV +tb pipe data api_kpis__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV diff --git a/ghost/web-analytics/tests/all_top_browsers.test b/ghost/web-analytics/tests/all_top_browsers.test index 1e9a0bc916..418a0f72ba 100644 --- a/ghost/web-analytics/tests/all_top_browsers.test +++ b/ghost/web-analytics/tests/all_top_browsers.test @@ -1 +1 @@ -tb pipe data top_browsers__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV +tb pipe data api_top_browsers__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV diff --git a/ghost/web-analytics/tests/all_top_devices.test b/ghost/web-analytics/tests/all_top_devices.test index 63b74dc435..72e109329e 100644 --- a/ghost/web-analytics/tests/all_top_devices.test +++ b/ghost/web-analytics/tests/all_top_devices.test @@ -1 +1 @@ -tb pipe data top_devices__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV +tb pipe data api_top_devices__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV diff --git a/ghost/web-analytics/tests/all_top_locations.test b/ghost/web-analytics/tests/all_top_locations.test index d20463d346..57f627ed5b 100644 --- a/ghost/web-analytics/tests/all_top_locations.test +++ b/ghost/web-analytics/tests/all_top_locations.test @@ -1 +1 @@ -tb pipe data top_locations__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV +tb pipe data api_top_locations__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV diff --git a/ghost/web-analytics/tests/all_top_pages.test b/ghost/web-analytics/tests/all_top_pages.test index 24ff1d89b2..f0699abe83 100644 --- a/ghost/web-analytics/tests/all_top_pages.test +++ b/ghost/web-analytics/tests/all_top_pages.test @@ -1 +1 @@ -tb pipe data top_pages__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV +tb pipe data api_top_pages__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV diff --git a/ghost/web-analytics/tests/all_top_sources.test b/ghost/web-analytics/tests/all_top_sources.test index 1cef353523..5a9ed682a1 100644 --- a/ghost/web-analytics/tests/all_top_sources.test +++ b/ghost/web-analytics/tests/all_top_sources.test @@ -1 +1 @@ -tb pipe data top_sources__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV +tb pipe data api_top_sources__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV diff --git a/ghost/web-analytics/tests/date_range_one_day_kpis.test b/ghost/web-analytics/tests/date_range_one_day_kpis.test index 5b1fa09ef6..5950a7f516 100644 --- a/ghost/web-analytics/tests/date_range_one_day_kpis.test +++ b/ghost/web-analytics/tests/date_range_one_day_kpis.test @@ -1 +1 @@ -tb pipe data kpis__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-01 --site_uuid mock_site_uuid --format CSV +tb pipe data api_kpis__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-01 --site_uuid mock_site_uuid --format CSV diff --git a/ghost/web-analytics/tests/filter_browser_chrome_kpis.test b/ghost/web-analytics/tests/filter_browser_chrome_kpis.test index 4fa5c1f8cd..5093288c30 100644 --- a/ghost/web-analytics/tests/filter_browser_chrome_kpis.test +++ b/ghost/web-analytics/tests/filter_browser_chrome_kpis.test @@ -1 +1 @@ -tb pipe data kpis__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --browser chrome +tb pipe data api_kpis__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --browser chrome diff --git a/ghost/web-analytics/tests/filter_browser_chrome_top_browsers.test b/ghost/web-analytics/tests/filter_browser_chrome_top_browsers.test index f9880f9727..5bdab6f9b3 100644 --- a/ghost/web-analytics/tests/filter_browser_chrome_top_browsers.test +++ b/ghost/web-analytics/tests/filter_browser_chrome_top_browsers.test @@ -1 +1 @@ -tb pipe data top_browsers__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --browser chrome +tb pipe data api_top_browsers__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --browser chrome diff --git a/ghost/web-analytics/tests/filter_browser_chrome_top_pages.test b/ghost/web-analytics/tests/filter_browser_chrome_top_pages.test index e8937e4ac4..5b6171ec46 100644 --- a/ghost/web-analytics/tests/filter_browser_chrome_top_pages.test +++ b/ghost/web-analytics/tests/filter_browser_chrome_top_pages.test @@ -1 +1 @@ -tb pipe data top_pages__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --browser chrome +tb pipe data api_top_pages__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --browser chrome diff --git a/ghost/web-analytics/tests/filter_browser_chrome_top_sources.test b/ghost/web-analytics/tests/filter_browser_chrome_top_sources.test index 20b6acf805..0362f3caca 100644 --- a/ghost/web-analytics/tests/filter_browser_chrome_top_sources.test +++ b/ghost/web-analytics/tests/filter_browser_chrome_top_sources.test @@ -1 +1 @@ -tb pipe data top_sources__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --browser chrome +tb pipe data api_top_sources__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --browser chrome diff --git a/ghost/web-analytics/tests/filter_source_bing_kpis.test b/ghost/web-analytics/tests/filter_source_bing_kpis.test index 569f31779c..68f47a64d1 100644 --- a/ghost/web-analytics/tests/filter_source_bing_kpis.test +++ b/ghost/web-analytics/tests/filter_source_bing_kpis.test @@ -1 +1 @@ -tb pipe data kpis__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --source bing.com +tb pipe data api_kpis__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --source bing.com diff --git a/ghost/web-analytics/tests/filter_source_bing_top_browsers.test b/ghost/web-analytics/tests/filter_source_bing_top_browsers.test index c8911fcb99..f2d15fcb56 100644 --- a/ghost/web-analytics/tests/filter_source_bing_top_browsers.test +++ b/ghost/web-analytics/tests/filter_source_bing_top_browsers.test @@ -1 +1 @@ -tb pipe data top_browsers__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --source bing.com +tb pipe data api_top_browsers__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --source bing.com diff --git a/ghost/web-analytics/tests/filter_source_bing_top_pages.test b/ghost/web-analytics/tests/filter_source_bing_top_pages.test index 33a77dd39b..6b913c0ff7 100644 --- a/ghost/web-analytics/tests/filter_source_bing_top_pages.test +++ b/ghost/web-analytics/tests/filter_source_bing_top_pages.test @@ -1 +1 @@ -tb pipe data top_pages__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --source bing.com +tb pipe data api_top_pages__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --source bing.com diff --git a/ghost/web-analytics/tests/filter_source_bing_top_sources.test b/ghost/web-analytics/tests/filter_source_bing_top_sources.test index 3d13d32b79..56f799d97c 100644 --- a/ghost/web-analytics/tests/filter_source_bing_top_sources.test +++ b/ghost/web-analytics/tests/filter_source_bing_top_sources.test @@ -1 +1 @@ -tb pipe data top_sources__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --source bing.com +tb pipe data api_top_sources__v${TB_VERSION:-0} --date_from 2100-01-01 --date_to 2100-01-07 --site_uuid mock_site_uuid --format CSV --source bing.com