chore: Cloudflare modernization #1472

schmikei · 2025-08-18T21:44:41Z

This pull request is similar to #1454 where we use more modular libs but now we are using them for Cloudflare.

As of submission this PR is mostly validated via git diff.

Dasomeone

Couple comments, mostly all nits or minor things!

Overall looks good, but it'd be great if we could verify it with a test environment? Even a few screenshots would be a good sanity check :)

Dasomeone · 2025-12-04T13:35:51Z

cloudflare-mixin/dashboards_out/cloudflare-zone-overview.json

+                     "uid": "${datasource}"
                  },
-                  "expr": "increase(cloudflare_zone_requests_cached{job=~\"$job\", instance=~\"$instance\", zone=~\"$zone\"}[$__interval:]) / increase(cloudflare_zone_requests_total{job=~\"$job\", instance=~\"$instance\", zone=~\"$zone\"}[$__interval:])",
+                  "expr": "increase(cloudflare_zone_requests_cached{job=~\"integrations/cloudflare\",job=~\"$job\",cluster=~\"$cluster\",zone=~\"$zone\",script_name=~\"$script_name\",instance=~\"$instance\"}[$__interval:]) / increase(cloudflare_zone_requests_total{job=~\"integrations/cloudflare\",job=~\"$job\",cluster=~\"$cluster\",zone=~\"$zone\",script_name=~\"$script_name\",instance=~\"$instance\"}[$__interval:])",


This query is missing an increase offset :)

Dasomeone · 2025-12-04T13:36:55Z

cloudflare-mixin/config.libsonnet

+  metricsSource: 'prometheus',
+
+  // CloudflareMetricsDown alert filter variable
+  alertsMetricsDownJobName: 'integrations/cloudflare',


Minor nit, we should probably extract this and reuse it in the filteringSelector so that both are updated dynamically in case end users change it

Dasomeone · 2025-12-04T13:40:36Z

cloudflare-mixin/alerts.libsonnet

          {
            alert: 'CloudflareHighRequestRate',
            expr: |||
              sum without (instance) (100 * (rate(cloudflare_zone_requests_total[10m]) / clamp_min(rate(cloudflare_zone_requests_total[50m] offset 10m), 1))) > %(alertsHighRequestRate)s


Just noticed this is comparing 10 mins versus the previous 50m. I know that cleanly adds up to an hour, but it feels like an odd way to represent it.

Dasomeone · 2025-12-04T13:48:10Z

cloudflare-mixin/dashboards.libsonnet

+        ),
+
+      'cloudflare-geomap-overview.json':
+        g.dashboard.new(prefix + ' Geomap overview')


Minor nit, sentence case

Suggested change

g.dashboard.new(prefix + ' Geomap overview')

g.dashboard.new(prefix + ' geomap overview')

Dasomeone · 2025-12-04T13:48:56Z

cloudflare-mixin/panels.libsonnet

+        + g.panel.timeSeries.fieldConfig.defaults.custom.withSpanNulls(false),
+
+      geoMetricByCountryGeomapPanel:
+        g.panel.geomap.new('Geographic Distribution')


Suggested change

g.panel.geomap.new('Geographic Distribution')

g.panel.geomap.new('Geographic distribution')

Dasomeone · 2025-12-04T13:52:42Z

cloudflare-mixin/panels.libsonnet

+          description='Duration of worker execution.'
+        )
+        + g.panel.timeSeries.standardOptions.withUnit('s')
+        + g.panel.timeSeries.fieldConfig.defaults.custom.withFillOpacity(54)


Dasomeone · 2025-12-04T13:52:49Z

cloudflare-mixin/panels.libsonnet

+          description='Rate of requests to the worker.'
+        )
+        + g.panel.timeSeries.standardOptions.withUnit('reqps')
+        + g.panel.timeSeries.fieldConfig.defaults.custom.withFillOpacity(0)


Should be 10 or greater

Dasomeone · 2025-12-04T13:52:57Z

cloudflare-mixin/panels.libsonnet

+          description='Number of errors from the worker.'
+        )
+        + g.panel.timeSeries.standardOptions.withUnit('short')
+        + g.panel.timeSeries.fieldConfig.defaults.custom.withFillOpacity(0)


Dasomeone · 2025-12-04T13:53:58Z

cloudflare-mixin/signals/geomap.libsonnet

+  },
+  signals: {
+    geoMapByCountry: {
+      name: '$geo_metric Distribution',


Maybe I'm still mentally on vacation, but I don't recall seeing this used in the name before, just wanted to call out that it's a cool usage!

Dasomeone · 2025-12-04T13:55:48Z

cloudflare-mixin/links.libsonnet

+      + link.link.options.withKeepTime(true),
+    otherDashboards:
+      link.dashboards.new('All dashboards', this.config.dashboardTags)
+      + link.dashboards.options.withIncludeVars(true)


We'll want to add withIncludeVars(true) to each of the manual entries above as well

postnati · 2025-12-09T22:08:26Z

cloudflare-mixin/mixin.libsonnet

+local optional_labels = {
+  script_name+: {
+    allValue: '.*',
+    label: 'Script',
+  },
+};


Suggested change

local optional_labels = {

script_name+: {

allValue: '.*',

label: 'Script',

},

};

local optional_labels = {

cluster+: {

allValue: '.*',

},

script_name+: {

allValue: '.*',

label: 'Script',

},

zone+: {

allValue: '.*',

label: 'Zone',

},

};

Worker data coming in was missing the zone label, causing no data to show up in the worker dashboard vs. the old dashboards.

…asing, worker data

- Modernize geoMetricByCountryGeomapPanel with full geomap configuration - Added transformations (groupBy, organize) - Configured geomap layers, basemap, controls, and view - Set color mode to continuous-BlPu - Increased panel height from 12 to 24 for better visibility - Modernize geoMetricsByCountryTablePanel - Use shared geoTransformations for DRY code - Added field overrides for gauge visualization on Total/Mean/Last - Configured sort by Total column descending - Modernize poolStatusPanel - Added joinByField and organize transformations - Configured Health column with color-coded mappings (green=Healthy, red=Unhealthy) - Set proper field ordering and renaming - Configuration improvements - Added shared geoTransformations helper to eliminate duplication - Set interval to 2m with intervalFactor 2 for geographic panels - Use standard withTargets approach instead of asTable() for consistency

postnati · 2025-12-12T15:25:01Z

Zone Overview

Worker Overview

Geomap Overview

…n-additions Dashboard and signal updates

schmikei added 2 commits August 18, 2025 17:44

wip

3fa993e

fix lint

7386d9e

Dasomeone added the monitoring-mixins label Aug 21, 2025

some formatting

8deafd8

schmikei changed the title ~~chore: Cloudflare modernization (WIP)~~ chore: Cloudflare modernization Aug 27, 2025

schmikei marked this pull request as ready for review August 27, 2025 15:42

schmikei requested a review from a team as a code owner August 27, 2025 15:42

schmikei marked this pull request as draft August 27, 2025 15:43

schmikei marked this pull request as ready for review November 25, 2025 21:35

Dasomeone reviewed Dec 4, 2025

View reviewed changes

Dasomeone self-assigned this Dec 4, 2025

postnati requested changes Dec 9, 2025

View reviewed changes

schmikei and others added 5 commits December 11, 2025 10:40

address PR feedback; offsets, fillOpacity, filteringSelector usage, c…

62e4a74

…asing, worker data

make fmt

0b6c793

Updated panels and signals to match legacy dashboards where appropriate

a1f4b25

Rebuilt dashboards after rebasing to latest

99a68c8

Merge pull request #1 from postnati/gpattison/cloudflare-modernizatio…

6c94f52

…n-additions Dashboard and signal updates

	g.dashboard.new(prefix + ' Geomap overview')
	g.dashboard.new(prefix + ' geomap overview')

	g.panel.geomap.new('Geographic Distribution')
	g.panel.geomap.new('Geographic distribution')

chore: Cloudflare modernization #1472

Are you sure you want to change the base?

chore: Cloudflare modernization #1472

Uh oh!

Conversation

schmikei commented Aug 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Dasomeone left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

postnati commented Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Zone Overview

Worker Overview

Geomap Overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

schmikei commented Aug 18, 2025 •

edited

Loading

postnati commented Dec 12, 2025 •

edited

Loading