diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 28a9d5d4..3d54b9a3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- - master
+ - main
tags:
- v[0-9]+.[0-9]+.[0-9]+**
pull_request:
@@ -104,9 +104,9 @@ jobs:
version=$(cat build/version.txt)
docker push grafana/carbon-relay-ng:$version
# only versions without a hyphen - e.g. actual releases - are tagged as latest.
- # in-between-release versions are tagged as master.
+ # in-between-release versions are tagged as main.
tag=latest
- [[ ! "$version" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && tag=master
+ [[ ! "$version" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && tag=main
docker push grafana/carbon-relay-ng:$tag
github_binaries:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e577755e..ec2fc1f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -115,9 +115,9 @@ See https://hub.docker.com/r/grafana/carbon-relay-ng for all Docker image update
* BREAKING: switch to logrus for logging. #317, #326
If you were previously using log level notice, you should now use info.
- See [logging docs](https://github.com/grafana/carbon-relay-ng/blob/master/docs/logging.md) for more info on the log levels.
+ See [logging docs](https://github.com/grafana/carbon-relay-ng/blob/main/docs/logging.md) for more info on the log levels.
* IMPORTANT: refactor release process, docker tags and package repo. #330, #331
- see [installation docs](https://github.com/grafana/carbon-relay-ng/blob/master/docs/installation-building.md)
+ see [installation docs](https://github.com/grafana/carbon-relay-ng/blob/main/docs/installation-building.md)
* fix memory leak when connections should be closed. #259, #329
* Rewrite of the inputs. pickle, tcp, udp and data reading.
They are now plugins, handle errors better, and support timeouts.
@@ -196,7 +196,7 @@ show target address for GrafanaNet routes #244
rule of thumb: rate in metrics/s times how many seconds you want to be able to buffer in case of downstream issues. memory used will be `bufSize * 100B` or use `bufSize * 150B` to be extra safe.
- blocking: when the route's buffer fills up, ingestion into the route will slow down/block, providing backpressure to the clients, and also blocking other routes from making progress. use this only if you know what you're doing and have smart clients that can gracefully handle the backpressure
* monitor queue drops for non-blocking queues
-* [document route options better](https://github.com/grafana/carbon-relay-ng/blob/master/docs/routes.md)
+* [document route options better](https://github.com/grafana/carbon-relay-ng/blob/main/docs/routes.md)
* monitor queue size and ram used #218
* preliminary support for parsing out the new graphite tag format (kafkaMdm and grafanaNet route only)
diff --git a/README.md b/README.md
index a76aa5f3..5ab89b0c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
[](https://goreportcard.com/report/github.com/grafana/carbon-relay-ng)
[](https://godoc.org/github.com/grafana/carbon-relay-ng)
-
+
carbon-relay-ng
@@ -24,24 +24,24 @@ Or balance/split load, or provide redundancy, or partition the data, etc.
This pattern allows alerting and event processing systems to act on the data as it is received (which is much better than repeated reading from your storage)
-
+
Documentation
=============
-* [configuration](https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md)
-* [input](https://github.com/grafana/carbon-relay-ng/blob/master/docs/input.md)
-* [validation](https://github.com/grafana/carbon-relay-ng/blob/master/docs/validation.md)
-* [rewriting](https://github.com/grafana/carbon-relay-ng/blob/master/docs/rewriting.md)
-* [aggregation](https://github.com/grafana/carbon-relay-ng/blob/master/docs/aggregation.md)
-* [monitoring](https://github.com/grafana/carbon-relay-ng/blob/master/docs/monitoring.md)
-* [TCP admin interface](https://github.com/grafana/carbon-relay-ng/blob/master/docs/tcp-admin-interface.md)
-* [current changelog](https://github.com/grafana/carbon-relay-ng/blob/master/CHANGELOG.md) and [official releasess](https://github.com/grafana/carbon-relay-ng/releases)
- * [release process](https://github.com/grafana/carbon-relay-ng/blob/master/docs/installation-building.md#release-process)
-* [limitations](https://github.com/grafana/carbon-relay-ng/blob/master/docs/limitations.md)
-* [installation and building](https://github.com/grafana/carbon-relay-ng/blob/master/docs/installation-building.md)
-* [Deploying on Kubernetes](https://github.com/grafana/carbon-relay-ng/blob/master/docs/deploying-on-k8s.md)
-* [Troubleshooting](https://github.com/grafana/carbon-relay-ng/blob/master/docs/troubleshooting.md)
+* [configuration](https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md)
+* [input](https://github.com/grafana/carbon-relay-ng/blob/main/docs/input.md)
+* [validation](https://github.com/grafana/carbon-relay-ng/blob/main/docs/validation.md)
+* [rewriting](https://github.com/grafana/carbon-relay-ng/blob/main/docs/rewriting.md)
+* [aggregation](https://github.com/grafana/carbon-relay-ng/blob/main/docs/aggregation.md)
+* [monitoring](https://github.com/grafana/carbon-relay-ng/blob/main/docs/monitoring.md)
+* [TCP admin interface](https://github.com/grafana/carbon-relay-ng/blob/main/docs/tcp-admin-interface.md)
+* [current changelog](https://github.com/grafana/carbon-relay-ng/blob/main/CHANGELOG.md) and [official releasess](https://github.com/grafana/carbon-relay-ng/releases)
+ * [release process](https://github.com/grafana/carbon-relay-ng/blob/main/docs/installation-building.md#release-process)
+* [limitations](https://github.com/grafana/carbon-relay-ng/blob/main/docs/limitations.md)
+* [installation and building](https://github.com/grafana/carbon-relay-ng/blob/main/docs/installation-building.md)
+* [Deploying on Kubernetes](https://github.com/grafana/carbon-relay-ng/blob/main/docs/deploying-on-k8s.md)
+* [Troubleshooting](https://github.com/grafana/carbon-relay-ng/blob/main/docs/troubleshooting.md)
Concepts
@@ -52,12 +52,12 @@ You have 1 master routing table. This table contains 0-N routes. There's diffe
First: "matching": you can match metrics on one or more of: prefix, substring, or regex. All 3 default to "" (empty string, i.e. allow all).
The conditions are AND-ed. Regexes are more resource intensive and hence should - and often can be - avoided.
-* All incoming metrics are [validated](https://github.com/grafana/carbon-relay-ng/blob/master/docs/validation.md) and go into the table when valid.
-* The table will then check metrics against the [blocklist](https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#blocklist) and discard when appropriate.
-* Then metrics pass through the [rewriters](https://github.com/grafana/carbon-relay-ng/blob/master/docs/rewriting.md) and are modified if applicable. Rewrite rules wrapped with forward slashes are interpreted as regular expressions.
+* All incoming metrics are [validated](https://github.com/grafana/carbon-relay-ng/blob/main/docs/validation.md) and go into the table when valid.
+* The table will then check metrics against the [blocklist](https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#blocklist) and discard when appropriate.
+* Then metrics pass through the [rewriters](https://github.com/grafana/carbon-relay-ng/blob/main/docs/rewriting.md) and are modified if applicable. Rewrite rules wrapped with forward slashes are interpreted as regular expressions.
* The table sends the metric to:
- * the [aggregators](https://github.com/grafana/carbon-relay-ng/blob/master/docs/aggregation.md), who match the metrics against their rules, compute aggregations and feed results back into the table. see Aggregation section below for details.
- * any [routes](https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#routes) that matches
+ * the [aggregators](https://github.com/grafana/carbon-relay-ng/blob/main/docs/aggregation.md), who match the metrics against their rules, compute aggregations and feed results back into the table. see Aggregation section below for details.
+ * any [routes](https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#routes) that matches
* The route can have different behaviors, based on its type:
* for grafanaNet / kafkaMdm / Google PubSub routes, there is only a single endpoint so that's where the data goes. For standard/carbon routes you can control how data gets routed into destinations (note that destinations have settings to match on prefix/sub/regex, just like routes):
diff --git a/build_docker.sh b/build_docker.sh
index 486f9cf9..1106d58e 100755
--- a/build_docker.sh
+++ b/build_docker.sh
@@ -1,10 +1,10 @@
#!/bin/bash
version=$(git describe --tags --always | sed 's/^v//')
-# only tag as latest if we're in master branch and the version tag has no hyphen in it.
+# only tag as latest if we're in main branch and the version tag has no hyphen in it.
# note: we may want to extend this to also not tag as latest if working tree is dirty.
# but i think because of how go bindata works, it probably makes a change in the working tree.
-tag=master
+tag=main
[[ "$GITHUB_EVENT_NAME" = "push" ]] && [[ "$GITHUB_REF_TYPE" = "tag" ]] && [[ "$version" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && tag=latest
diff --git a/cfg/table.go b/cfg/table.go
index 4c16299a..1974115f 100644
--- a/cfg/table.go
+++ b/cfg/table.go
@@ -213,7 +213,7 @@ func InitRoutes(table table.Interface, config Config, meta toml.MetaData) error
cfg, err := route.NewGrafanaNetConfig(routeConfig.Addr, routeConfig.ApiKey, routeConfig.SchemasFile, routeConfig.AggregationFile)
if err != nil {
log.Error(err.Error())
- log.Info("grafanaNet route configuration details: https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#grafananet-route")
+ log.Info("grafanaNet route configuration details: https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#grafananet-route")
return fmt.Errorf("error adding route '%s'", routeConfig.Key)
}
diff --git a/docs/aggregation.md b/docs/aggregation.md
index d892c65e..f93f67f3 100644
--- a/docs/aggregation.md
+++ b/docs/aggregation.md
@@ -53,20 +53,20 @@ The output of the aggregation bucket (after the wait timer expires) is then 1 po
## functions
-Available functions:
-
-function | output
----------------|----------------------------------------------
-avg | average (mean)
-count | number of points/values seen (count of items in the bucket)
-delta | difference between highest and lowest value seen
-derive | derivative (needs at least 2 input values. if more, derives from oldest to newest)
-last | last value seen in the bucket
-max | max value seen in the bucket
-min | min value seen in the bucket
-stdev | standard devation
-sum | sum
-percentiles | a set of different percentiles
+Available functions:
+
+| function | output |
+| ----------- | ---------------------------------------------------------------------------------- |
+| avg | average (mean) |
+| count | number of points/values seen (count of items in the bucket) |
+| delta | difference between highest and lowest value seen |
+| derive | derivative (needs at least 2 input values. if more, derives from oldest to newest) |
+| last | last value seen in the bucket |
+| max | max value seen in the bucket |
+| min | min value seen in the bucket |
+| stdev | standard devation |
+| sum | sum |
+| percentiles | a set of different percentiles |
## configuration
@@ -85,7 +85,7 @@ With a wait of 120, metrics can come 2 minutes after the start of the interval a
* `dropRaw=true` will prevent any further processing of the raw series "consumed" by an aggregator with this option enabled. It causes the original input series to disappear from the routing table. This can be useful for managing cardinality and for quantizing metrics sent at odd intervals. When using `dropRaw` an aggregator may produce a series with the same name as the input series. Note that this option may slow down table processing, especially with a cold or disabled aggregator cache.
-[config examples](https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#aggregators)
+[config examples](https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#aggregators)
## output
diff --git a/docs/deploying-on-k8s.md b/docs/deploying-on-k8s.md
index 46b5eff4..a8564fde 100644
--- a/docs/deploying-on-k8s.md
+++ b/docs/deploying-on-k8s.md
@@ -74,4 +74,4 @@ tk apply environments/default
For users who don't use Tanka, we also provide yaml files which can be used as templates to
create the necessary resources to deploy carbon-relay-ng.
-The yaml files are in the directory [/examples/k8s](https://github.com/grafana/carbon-relay-ng/tree/master/examples/k8s).
+The yaml files are in the directory [/examples/k8s](https://github.com/grafana/carbon-relay-ng/tree/main/examples/k8s).
diff --git a/docs/installation-building.md b/docs/installation-building.md
index 6dcee729..942ce151 100644
--- a/docs/installation-building.md
+++ b/docs/installation-building.md
@@ -1,9 +1,9 @@
# Installation
-## Release vs latest master
+## Release vs latest main
-Typically, some new code was added to master since the last release.
-See the [changelog](https://github.com/grafana/carbon-relay-ng/blob/master/CHANGELOG.md) or look at the [git log](https://github.com/grafana/carbon-relay-ng/commits/master) for the most up to date information.
+Typically, some new code was added to main since the last release.
+See the [changelog](https://github.com/grafana/carbon-relay-ng/blob/main/CHANGELOG.md) or look at the [git log](https://github.com/grafana/carbon-relay-ng/commits/main) for the most up to date information.
This may help you decide whether you want the latest release, or the latest code.
## Linux distribution packages
@@ -28,7 +28,7 @@ See [dockerhub](https://hub.docker.com/r/grafana/carbon-relay-ng/).
You can use these tags:
* `latest`: the latest official stable release
-* `master`: latest build from master. these versions typically bring improvements but possibly also new bugs
+* `main`: latest build from main. these versions typically bring improvements but possibly also new bugs
# Building from source
@@ -42,7 +42,7 @@ These commands will install the binary as `$GOPATH/bin/carbon-relay-ng`
cd $GOPATH/src/github.com/grafana/
git clone https://github.com/grafana/carbon-relay-ng.git
cd carbon-relay-ng
- # e.g. to check out a specific version instead of master:
+ # e.g. to check out a specific version instead of main:
# git checkout v1.1
go install github.com/shuLhan/go-bindata/cmd/go-bindata
make
@@ -55,7 +55,7 @@ This leaves you with a binary that you can run with a config file like so:
Usage:
carbon-relay-ng version
carbon-relay-ng
-
+
-block-profile-rate int
see https://golang.org/pkg/runtime/#SetBlockProfileRate
-cpuprofile string
@@ -68,10 +68,10 @@ Usage:
# Release process
During normal development, maintain CHANGELOG.md, and mark interesting -to users- changes under "unreleased" version.
-Grafana Labs regularly deploys the latest code from `master`, but cannot possibly do extensive testing of all functionality in production, so users are encouraged to run master also, and report any issues they hit.
-When interesting changes have been merged to master, and they have had a chance to be tested for a while, we tag a release, as follows:
+Grafana Labs regularly deploys the latest code from `main`, but cannot possibly do extensive testing of all functionality in production, so users are encouraged to run main also, and report any issues they hit.
+When interesting changes have been merged to main, and they have had a chance to be tested for a while, we tag a release, as follows:
-* Update CHANGELOG.md from `unreleased` to the version. Create a PR and merge into the master branch. [Example PR](https://github.com/grafana/carbon-relay-ng/pull/512)
+* Update CHANGELOG.md from `unreleased` to the version. Create a PR and merge into the main branch. [Example PR](https://github.com/grafana/carbon-relay-ng/pull/512)
* Create a git tag for the new version from the CHANGELOG commit merged from the PR and push the tag to GitHub.
Example for adding the v1.4.0 tag:
```
diff --git a/docs/monitoring.md b/docs/monitoring.md
index ca9e80b6..4c76209d 100644
--- a/docs/monitoring.md
+++ b/docs/monitoring.md
@@ -1,7 +1,7 @@
* Extensive performance variables are available in json at http://localhost:8081/debug/vars2 (update port if you change it in config)
* You can also send metrics to graphite (or feed back into the relay), see config.
-* Comes with a [grafana dashboard](https://github.com/grafana/carbon-relay-ng/blob/master/grafana-dashboard.json) which you can also [download from the grafana dashboards site](https://grafana.com/dashboards/338)
+* Comes with a [grafana dashboard](https://github.com/grafana/carbon-relay-ng/blob/main/grafana-dashboard.json) which you can also [download from the grafana dashboards site](https://grafana.com/dashboards/338)
-
+
diff --git a/docs/validation.md b/docs/validation.md
index 13fac8b0..8e9d3006 100644
--- a/docs/validation.md
+++ b/docs/validation.md
@@ -7,7 +7,7 @@ Incoming metrics are validated in multiple steps:
3. order validation
Invalid metrics are dropped and - provided the message could be parsed - can be seen at /badMetrics/timespec.json where timespec is something like 30s, 10m, 24h, etc.
-Carbon-relay-ng exports counters for invalid and out of order metrics (see [monitoring](https://github.com/grafana/carbon-relay-ng/blob/master/docs/monitoring.md))
+Carbon-relay-ng exports counters for invalid and out of order metrics (see [monitoring](https://github.com/grafana/carbon-relay-ng/blob/main/docs/monitoring.md))
Let's clarify step 2 and 3.
@@ -26,7 +26,7 @@ First of all, if the key contains `=` or `_is_` we validate the key as metric2.0
#### standard carbon key
| Level | Description |
-|------------------|---------------------------------------------------------------------------------------------------------------------------------|
+| ---------------- | ------------------------------------------------------------------------------------------------------------------------------- |
| none | no validation |
| medium (default) | ensure characters are 8-bit clean and not NULL. Optional tag appendix: see below |
| strict | medium + before appendix: block anything that can upset graphite: valid characters are `[A-Za-z0-9_-.]` and no consecutive dots |
@@ -45,7 +45,7 @@ Can be changed with `legacy_metric_validation` configuration parameter
#### metrics2.0
| Level | Description |
-|------------------|----------------------------------------------------------------------------|
+| ---------------- | -------------------------------------------------------------------------- |
| none | no validation |
| medium (default) | unit, mtype tag set. no mixing of `=` and `_is_` styles. at least two tags |
| strict | reserved for future |
diff --git a/examples/carbon-relay-ng.ini b/examples/carbon-relay-ng.ini
index edca0237..e0c10563 100644
--- a/examples/carbon-relay-ng.ini
+++ b/examples/carbon-relay-ng.ini
@@ -55,7 +55,7 @@ validate_order = false
bad_metrics_max_age = "24h"
# Blocklist
-# See https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Blocklist
+# See https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Blocklist
blocklist = [
]
@@ -78,17 +78,17 @@ amqp_retry = true
amqp_retrydelay = 30
# Aggregators
-# See https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Aggregators
+# See https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Aggregators
# Rewriters
-# See https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Rewriters
+# See https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Rewriters
# Routes
-# See https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Routes
+# See https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Routes
[init]
# init commands (DEPRECATED)
-# see https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Imperatives
+# see https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Imperatives
cmds = [
]
diff --git a/examples/carbon-relay-ng.service b/examples/carbon-relay-ng.service
index 53c825fc..c3a117f1 100644
--- a/examples/carbon-relay-ng.service
+++ b/examples/carbon-relay-ng.service
@@ -1,6 +1,6 @@
[Unit]
Description=Starts and stops carbon-relay-ng on this system
-Documentation=https://github.com/grafana/carbon-relay-ng/tree/master/docs
+Documentation=https://github.com/grafana/carbon-relay-ng/tree/main/docs
Wants=network-online.target
After=network-online.target
diff --git a/examples/k8s/deployment.yaml b/examples/k8s/deployment.yaml
index 497da2d7..e428a97b 100644
--- a/examples/k8s/deployment.yaml
+++ b/examples/k8s/deployment.yaml
@@ -22,38 +22,38 @@ spec:
name: carbon-relay-ng
spec:
containers:
- - env:
- - name: INSTANCE
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- - name: GRAFANA_NET_ADDR
- value: https://tsdb-1-.hosted-metrics.grafana.net/metrics
- - name: GRAFANA_NET_USER_ID
- value: api_key
- - name: GRAFANA_NET_API_KEY
- valueFrom:
- secretKeyRef:
- key: api_key
- name: crng-metrics-key
- image: grafana/carbon-relay-ng:master
- imagePullPolicy: Always
- name: carbon-relay-ng
- ports:
- - containerPort: 2003
- name: carbon
- resources:
- limits:
- cpu: "4"
- memory: 10Gi
- requests:
- cpu: "1"
- memory: 1Gi
- volumeMounts:
- - mountPath: /conf
- name: carbon-relay-ng-config
+ - env:
+ - name: INSTANCE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ - name: GRAFANA_NET_ADDR
+ value: https://tsdb-1-.hosted-metrics.grafana.net/metrics
+ - name: GRAFANA_NET_USER_ID
+ value: api_key
+ - name: GRAFANA_NET_API_KEY
+ valueFrom:
+ secretKeyRef:
+ key: api_key
+ name: crng-metrics-key
+ image: grafana/carbon-relay-ng:main
+ imagePullPolicy: Always
+ name: carbon-relay-ng
+ ports:
+ - containerPort: 2003
+ name: carbon
+ resources:
+ limits:
+ cpu: "4"
+ memory: 10Gi
+ requests:
+ cpu: "1"
+ memory: 1Gi
+ volumeMounts:
+ - mountPath: /conf
+ name: carbon-relay-ng-config
terminationGracePeriodSeconds: 30
volumes:
- - configMap:
+ - configMap:
+ name: carbon-relay-ng-config
name: carbon-relay-ng-config
- name: carbon-relay-ng-config
\ No newline at end of file
diff --git a/examples/storage-aggregation.conf b/examples/storage-aggregation.conf
index 203e5b0b..fa09c78f 100644
--- a/examples/storage-aggregation.conf
+++ b/examples/storage-aggregation.conf
@@ -1,5 +1,5 @@
# You only need this file if you want to use the grafanaNet route
-# (https://github.com/grafana/carbon-relay-ng/blob/master/docs/grafana-net.md)
+# (https://github.com/grafana/carbon-relay-ng/blob/main/docs/grafana-net.md)
# and you want to configure how points are aggregated when rendering data.
# In all other cases you can ignore this file.
# This file describes what aggregation (rollup) methods to use for long term storage.
diff --git a/examples/storage-schemas.conf b/examples/storage-schemas.conf
index 6c3c1786..91a6e713 100644
--- a/examples/storage-schemas.conf
+++ b/examples/storage-schemas.conf
@@ -1,5 +1,5 @@
# You only need this file if you want to use the grafanaNet or kafkaMdm route
-# (https://github.com/grafana/carbon-relay-ng/blob/master/docs/grafana-net.md)
+# (https://github.com/grafana/carbon-relay-ng/blob/main/docs/grafana-net.md)
# In all other cases you can ignore this file.
# It is important that these intervals accurately match the interval of the data you're sending
# To find your actual file, check your existing Graphite installation if you have one.
diff --git a/experiments/issue-241/carbon-relay-ng.ini b/experiments/issue-241/carbon-relay-ng.ini
index 346737fb..d115dc23 100644
--- a/experiments/issue-241/carbon-relay-ng.ini
+++ b/experiments/issue-241/carbon-relay-ng.ini
@@ -55,7 +55,7 @@ validate_order = false
bad_metrics_max_age = "24h"
# Blocklist
-# See https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Blocklist
+# See https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Blocklist
blocklist = [
]
@@ -75,10 +75,10 @@ amqp_durable = false
amqp_exclusive = true
# Aggregators
-# See https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Aggregators
+# See https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Aggregators
# Rewriters
-# See https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Rewriters
+# See https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Rewriters
#[[rewriter]]
#old = '/(.*)/'
@@ -87,11 +87,11 @@ amqp_exclusive = true
#max = -1
# Routes
-# See https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Routes
+# See https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Routes
[init]
# init commands (DEPRECATED)
-# see https://github.com/grafana/carbon-relay-ng/blob/master/docs/config.md#Imperatives
+# see https://github.com/grafana/carbon-relay-ng/blob/main/docs/config.md#Imperatives
cmds = [
'addAgg count regex=s(.*)\..* s$1.count.1 10 20 cache=true',
'addAgg count regex=so(.*)\..* so$1.count.2 10 20 cache=true',
diff --git a/jsonnet/lib/carbon-relay-ng/crng.libsonnet b/jsonnet/lib/carbon-relay-ng/crng.libsonnet
index 92d9979b..a6b2744e 100644
--- a/jsonnet/lib/carbon-relay-ng/crng.libsonnet
+++ b/jsonnet/lib/carbon-relay-ng/crng.libsonnet
@@ -1,7 +1,7 @@
local k = import 'ksonnet-util/kausal.libsonnet';
{
_images+:: {
- carbon_relay_ng: 'grafana/carbon-relay-ng:master',
+ carbon_relay_ng: 'grafana/carbon-relay-ng:main',
},
_config+:: {
diff --git a/jsonnet/lib/carbon-relay-ng/files/storage-aggregation.conf b/jsonnet/lib/carbon-relay-ng/files/storage-aggregation.conf
index 203e5b0b..fa09c78f 100644
--- a/jsonnet/lib/carbon-relay-ng/files/storage-aggregation.conf
+++ b/jsonnet/lib/carbon-relay-ng/files/storage-aggregation.conf
@@ -1,5 +1,5 @@
# You only need this file if you want to use the grafanaNet route
-# (https://github.com/grafana/carbon-relay-ng/blob/master/docs/grafana-net.md)
+# (https://github.com/grafana/carbon-relay-ng/blob/main/docs/grafana-net.md)
# and you want to configure how points are aggregated when rendering data.
# In all other cases you can ignore this file.
# This file describes what aggregation (rollup) methods to use for long term storage.
diff --git a/jsonnet/lib/carbon-relay-ng/jsonnetfile.json b/jsonnet/lib/carbon-relay-ng/jsonnetfile.json
index 39b7562a..826bdb1d 100644
--- a/jsonnet/lib/carbon-relay-ng/jsonnetfile.json
+++ b/jsonnet/lib/carbon-relay-ng/jsonnetfile.json
@@ -8,7 +8,7 @@
"subdir": "ksonnet-util"
}
},
- "version": "master"
+ "version": "main"
}
]
}
\ No newline at end of file