Merge pull request #189 from gncaglar/add-asn-metrics

feat: add ASN metrics

Author: haad

cloudflare.go

@@ -85,6 +85,33 @@ type cloudflareResponseLogpushZone struct {
 	} `json:"viewer"`
 }
 
+type cloudflareResponseASN struct {
+	Viewer struct {
+		Zones []zoneRespASN `json:"zones"`
+	} `json:"viewer"`
+}
+
+type zoneRespASN struct {
+	ZoneTag string `json:"zoneTag"`
+
+	HttpRequestsASNGroups []struct {
+		Count      uint64 `json:"count"`
+		Dimensions struct {
+			Datetime             string `json:"datetime"`
+			ClientASN            string `json:"clientAsn"`
+			ClientASNDescription string `json:"clientASNDescription"`
+		} `json:"dimensions"`
+		Sum struct {
+			EdgeResponseBytes uint64 `json:"edgeResponseBytes"`
+			Visits            uint64 `json:"visits"`
+		} `json:"sum"`
+		Avg struct {
+			SampleInterval float64 `json:"sampleInterval"`
+		} `json:"avg"`
+	} `json:"httpRequestsAdaptiveGroups"`
+}
+
+
 type cloudflareResponseEdgeErrorsByPath struct {
 	Viewer struct {
 		Zones []zoneRespEdgeErrorsByPath `json:"zones"`
@@ -1104,3 +1131,54 @@ func filterNonFreePlanZones(zones []cfzones.Zone) (filteredZones []cfzones.Zone)
 	}
 	return
 }
+
+func fetchASNTotals(zoneIDs []string) (*cloudflareResponseASN, error) {
+	request := graphql.NewRequest(`
+	query ($zoneIDs: [String!], $mintime: Time!, $maxtime: Time!, $limit: Int!) {
+		viewer {
+			zones(filter: { zoneTag_in: $zoneIDs }) {
+				zoneTag
+				httpRequestsAdaptiveGroups(
+					limit: $limit
+					filter: { datetime_geq: $mintime, datetime_lt: $maxtime }
+					orderBy: [count_DESC]
+				) {
+					count
+					avg {
+						sampleInterval
+					}
+					dimensions {
+						datetime
+						clientAsn
+						clientASNDescription
+					}
+					sum {
+						edgeResponseBytes
+						visits
+					}
+				}
+			}
+		}
+	}
+`)
+
+	now, now1mAgo := GetTimeRange()
+	request.Var("limit", gqlQueryLimit)
+	request.Var("maxtime", now)
+	request.Var("mintime", now1mAgo)
+	request.Var("zoneIDs", zoneIDs)
+
+	gql.Mu.RLock()
+	defer gql.Mu.RUnlock()
+
+	ctx, cancel := context.WithTimeout(context.Background(), cftimeout)
+	defer cancel()
+
+	var resp cloudflareResponseASN
+	if err := gql.Client.Run(ctx, request, &resp); err != nil {
+		log.Errorf("failed to fetch ASN totals, err:%v", err)
+		return nil, err
+	}
+
+	return &resp, nil
+}

main.go

@@ -158,6 +158,9 @@ func fetchMetrics() {
 		go fetchLogpushAnalyticsForZone(filteredZones, &wg)
 
 		wg.Add(1)
+		go fetchZoneASNAnalytics(filteredZones, &wg)
+    
+    wg.Add(1)
 		go fetchEdgeErrorsByPathAnalytics(filteredZones, &wg)
 	} else if zoneCount > cfgraphqlreqlimit {
 		for s := 0; s < zoneCount; s += cfgraphqlreqlimit {
@@ -178,6 +181,9 @@ func fetchMetrics() {
 			go fetchLogpushAnalyticsForZone(filteredZones[s:e], &wg)
 
 			wg.Add(1)
+			go fetchZoneASNAnalytics(filteredZones[s:e], &wg)
+      
+      wg.Add(1)
 			go fetchEdgeErrorsByPathAnalytics(filteredZones[s:e], &wg)
 		}
 	}

prometheus.go

@@ -63,6 +63,8 @@ const (
 	tunnelHealthStatusMetricName                    MetricName = "cloudflare_tunnel_health_status"
 	tunnelConnectorInfoMetricName                   MetricName = "cloudflare_tunnel_connector_info"
 	tunnelConnectorActiveConnectionsMetricName      MetricName = "cloudflare_tunnel_connector_active_connections"
+	zoneRequestASNMetricName                        MetricName = "cloudflare_zone_requests_asn"
+	zoneBandwidthASNMetricName                      MetricName = "cloudflare_zone_bandwidth_asn"
 	zoneEdgeErrorsByPathMetricName                  MetricName = "cloudflare_zone_edge_errors_by_path"
 )
 
@@ -336,6 +338,16 @@ var (
 		Help: "Reports number of active connections for a Cloudflare Tunnel connector",
 	}, []string{"account", "tunnel_id", "client_id"})
 
+	zoneRequestASN = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: zoneRequestASNMetricName.String(),
+		Help: "Number of requests per ASN (Autonomous System Number)",
+	}, []string{"zone", "account", "asn", "asn_description"})
+
+	zoneBandwidthASN = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: zoneBandwidthASNMetricName.String(),
+		Help: "Bandwidth per ASN (Autonomous System Number) in bytes",
+	}, []string{"zone", "account", "asn", "asn_description"})
+  
 	zoneEdgeErrorsByPath = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Name: zoneEdgeErrorsByPathMetricName.String(),
 		Help: "Number of edge errors (4xx and 5xx) by request path",
@@ -386,6 +398,8 @@ func buildAllMetricsSet() MetricsSet {
 	allMetricsSet.Add(tunnelHealthStatusMetricName)
 	allMetricsSet.Add(tunnelConnectorInfoMetricName)
 	allMetricsSet.Add(tunnelConnectorActiveConnectionsMetricName)
+	allMetricsSet.Add(zoneRequestASNMetricName)
+	allMetricsSet.Add(zoneBandwidthASNMetricName)
 	allMetricsSet.Add(zoneEdgeErrorsByPathMetricName)
 	return allMetricsSet
 }
@@ -533,6 +547,12 @@ func mustRegisterMetrics(deniedMetrics MetricsSet) {
 	if !deniedMetrics.Has(tunnelConnectorActiveConnectionsMetricName) {
 		prometheus.MustRegister(tunnelConnectorActiveConnections)
 	}
+	if !deniedMetrics.Has(zoneRequestASNMetricName) {
+		prometheus.MustRegister(zoneRequestASN)
+	}
+	if !deniedMetrics.Has(zoneBandwidthASNMetricName) {
+		prometheus.MustRegister(zoneBandwidthASN)
+  }
 	if !deniedMetrics.Has(zoneEdgeErrorsByPathMetricName) {
 		prometheus.MustRegister(zoneEdgeErrorsByPath)
 	}
@@ -1099,3 +1119,48 @@ func getCloudflareTunnelStatusValue(status string) uint8 {
 		return 255
 	}
 }
+
+func fetchZoneASNAnalytics(zones []cfzones.Zone, wg *sync.WaitGroup) {
+	defer wg.Done()
+
+	// ASN metrics are not available in free tier
+	if viper.GetBool("free_tier") {
+		return
+	}
+
+	zoneIDs := extractZoneIDs(zones)
+	if len(zoneIDs) == 0 {
+		return
+	}
+
+	r, err := fetchASNTotals(zoneIDs)
+	if err != nil {
+		return
+	}
+
+	for _, z := range r.Viewer.Zones {
+		name, account := findZoneAccountName(zones, z.ZoneTag)
+		addASNGroups(&z, name, account)
+	}
+}
+
+func addASNGroups(z *zoneRespASN, name string, account string) {
+	if len(z.HttpRequestsASNGroups) == 0 {
+		return
+	}
+
+	for _, g := range z.HttpRequestsASNGroups {
+		asn := g.Dimensions.ClientASN
+		asnDesc := g.Dimensions.ClientASNDescription
+		if asnDesc == "" {
+			asnDesc = "unknown"
+		}
+
+		zoneRequestASN.With(prometheus.Labels{
+			"zone": name, "account": account, "asn": asn, "asn_description": asnDesc,
+		}).Add(float64(g.Count))
+		zoneBandwidthASN.With(prometheus.Labels{
+			"zone": name, "account": account, "asn": asn, "asn_description": asnDesc,
+		}).Add(float64(g.Sum.EdgeResponseBytes))
+	}
+}