Skip to content

Commit

Permalink
Fix main branch links (open-telemetry#326)
Browse files Browse the repository at this point in the history
  • Loading branch information
flands authored Apr 23, 2021
1 parent 697f99f commit 2156247
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion cmd/otelcol/config/collector/agent_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ processors:
# ballast size is set the value of SPLUNK_BALLAST_SIZE_MIB env variable. Alternatively, the
# --mem-ballast-size-mib command line flag can be passed and take priority.
# For more information about memory limiter, see
# https://github.com/open-telemetry/opentelemetry-collector/blob/master/processor/memorylimiter/README.md
# https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiter/README.md
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 2s
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcol/config/collector/gateway_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ processors:
# ballast size is set the value of SPLUNK_BALLAST_SIZE_MIB env variable. Alternatively, the
# --mem-ballast-size-mib command line flag can be passed and take priority.
# For more information about memory limiter, see
# https://github.com/open-telemetry/opentelemetry-collector/blob/master/processor/memorylimiter/README.md
# https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiter/README.md
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 2s
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcol/config/collector/otlp_config_linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ processors:
# ballast size is set the value of SPLUNK_BALLAST_SIZE_MIB env variable. Alternatively, the
# --mem-ballast-size-mib command line flag can be passed and take priority.
# For more information about memory limiter, see
# https://github.com/open-telemetry/opentelemetry-collector/blob/master/processor/memorylimiter/README.md
# https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiter/README.md
memory_limiter:
ballast_size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
check_interval: 2s
Expand Down
4 changes: 2 additions & 2 deletions docs/signalfx-smart-agent-migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Receiver](../internal/receiver/smartagentreceiver/README.md), its associated
Collector components provide a means of integrating all Smart Agent metric
monitors into your Collector pipelines.

The [SignalFx Smart Agent's](https://github.com/signalfx/signalfx-agent/blob/master/README.md)
The [SignalFx Smart Agent's](https://github.com/signalfx/signalfx-agent/blob/main/README.md)
metric monitors allow real-time insights into how your target services and
applications are performing. These metric gathering utilities have an
equivalent counterpart in the OpenTelemetry Collector, the metric receiver.
Expand Down Expand Up @@ -66,7 +66,7 @@ Below is an equivalent, recommended Collector configuration. Notice that the
`signalfx-forwarder` monitor's associated `smartagent/signalfx-forwarder` receiver instance
is part of both `metrics` and `traces` pipelines using the `signalfx` and `sapm` exporters,
respectively. The additional metric monitors utilize the
[Receiver Creator](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/master/receiver/receivercreator/README.md):
[Receiver Creator](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/receivercreator/README.md):

```yaml
extensions:
Expand Down
4 changes: 2 additions & 2 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Troubleshooting

Start by reviewing the [OpenTelemetry Collector troubleshooting
documentation](https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/troubleshooting.md).
documentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/troubleshooting.md).

## Gathering Support Information

Expand Down Expand Up @@ -103,7 +103,7 @@ $ journalctl -u my-service.service -f
exporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/loggingexporter)
and check logs (`journalctl -u splunk-otel-collector.service -f`)
- Review the [Collector troubleshooting
documentation](https://github.com/open-telemetry/opentelemetry-collector/blob/master/docs/troubleshooting.md).
documentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/troubleshooting.md).

### Sending synthetic data

Expand Down
10 changes: 5 additions & 5 deletions internal/receiver/smartagentreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ which is already provided for supported Splunk Distribution of OpenTelemetry Col
## Configuration

Each `smartagent` receiver configuration acts a drop-in replacement for each supported Smart Agent Monitor
[configuration](https://github.com/signalfx/signalfx-agent/blob/master/docs/monitor-config.md) with some exceptions:
[configuration](https://github.com/signalfx/signalfx-agent/blob/main/docs/monitor-config.md) with some exceptions:

1. Any Agent global or collectd desired configuration should be performed via the
[Smart Agent Extension](../../extension/smartagentextension/README.md).
1. In lieu of `discoveryRule` support, the Collector's
[`receivercreator`](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/master/receiver/receivercreator/README.md)
and associated [Observer extensions](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/master/extension/observer/README.md)
[`receivercreator`](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/receivercreator/README.md)
and associated [Observer extensions](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/README.md)
should be used.
1. The [`signalfx-forwarder`](https://github.com/signalfx/signalfx-agent/blob/master/docs/monitors/signalfx-forwarder.md)
1. The [`signalfx-forwarder`](https://github.com/signalfx/signalfx-agent/blob/main/docs/monitors/signalfx-forwarder.md)
monitor should be made part of both `metrics` and `traces` pipelines utilizing the
[`signalfx`](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/signalfxexporter/README.md)
and [`sapm`](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/exporter/sapmexporter/README.md) exporters, respectively.
1. All metric content replacement and transformation rules should utilize existing
[Collector processors](https://github.com/open-telemetry/opentelemetry-collector/blob/master/processor/README.md).
[Collector processors](https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/README.md).
1. Monitors with [dimension property and tag update
functionality](https://dev.splunk.com/observability/docs/datamodel#Creating-or-updating-custom-properties-and-tags)
allow an associated `dimensionClients` field that references the name of the SignalFx exporter you are using in your
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"go.uber.org/zap"
)

// based on https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/master/receiver/signalfxreceiver/signalfxv2_to_metricdata_test.go
// based on https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/signalfxreceiver/signalfxv2_to_metricdata_test.go

var now = time.Now()

Expand Down
2 changes: 1 addition & 1 deletion internal/receiver/smartagentreceiver/filtering.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package smartagentreceiver

// Ported from https://github.com/signalfx/signalfx-agent/blob/master/pkg/monitors/filtering.go
// Ported from https://github.com/signalfx/signalfx-agent/blob/main/pkg/monitors/filtering.go

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion internal/receiver/smartagentreceiver/filtering_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package smartagentreceiver

// Ported from https://github.com/signalfx/signalfx-agent/blob/master/pkg/monitors/filtering_test.go
// Ported from https://github.com/signalfx/signalfx-agent/blob/main/pkg/monitors/filtering_test.go

import (
"fmt"
Expand Down

0 comments on commit 2156247

Please sign in to comment.