Merge changes in main to release (#1002)

* DOCS-3971 Switch descriptions for metrics (#966) * DOCS-3971: Switch descriptions for metrics Doc feedback given in this JIRA ticket: https://signalfuse.atlassian.net/browse/DOCS-3971 * Added period * updated data resolution fields for swapped metrics * Add entry for numLimitedMetricTimeSeriesCreateCallsByCategoryTypeByToken (#967) * Add entry for numLimitedMetricTimeSeriesCreateCallsByCategoryTypeByToken * Use MD not RST syntax * DOCS-2113: Document subscription metrics (#968) * Add host-based limit metrics to metrics.yaml * Update metrics.yaml * Revert "DOCS-2113: Document subscription metrics (#968)" (#969) This reverts commit bee12ad. * Update metrics.yaml (#970) * Jmalin docs4360 no mts definition (#972) * DOC-4360: Add MTS definitions Add definitions of active and inactive MTS. * DOCS-4360: Edit and cleanup * DOCS-1552: Update documentation of IMM Metrics (#971) * Update metrics.yaml * Add two metrics to metrics.yaml * Update sf.org.numResourceMetrics * Update descriptions of new metrics * Update sf.org.subscription.function description * Add subscription details to new metrics * Update from Joe suggestions * Changes to metrics.yaml * Update docs for v5.23.0 (#974) SignalFx Smart Agent release v5.23.0 contained multiple documentation changes. This commit updates integration docs to match changes. * Mfoulds doc4443 (#976) * added space before brief * Update metrics.yaml (#975) * added spaces to line 374 to fix build error(?) * DOCS-4504: Fix YAML file (#978) Fix formatting problems in signalfx-org-metrics/metrics.yaml * Update metrics.yaml (#980) * fixed typos (#982) * merge jmalin-docs-4360-no-MTS-definition changes from master to release (#973) (#985) * DOCS-3971 Switch descriptions for metrics (#966) * DOCS-3971: Switch descriptions for metrics Doc feedback given in this JIRA ticket: https://signalfuse.atlassian.net/browse/DOCS-3971 * Added period * updated data resolution fields for swapped metrics * Add entry for numLimitedMetricTimeSeriesCreateCallsByCategoryTypeByToken (#967) * Add entry for numLimitedMetricTimeSeriesCreateCallsByCategoryTypeByToken * Use MD not RST syntax * DOCS-2113: Document subscription metrics (#968) * Add host-based limit metrics to metrics.yaml * Update metrics.yaml * Revert "DOCS-2113: Document subscription metrics (#968)" (#969) This reverts commit bee12ad. * Update metrics.yaml (#970) * Jmalin docs4360 no mts definition (#972) * DOC-4360: Add MTS definitions Add definitions of active and inactive MTS. * DOCS-4360: Edit and cleanup Co-authored-by: mbechtold-splunk <[email protected]> Co-authored-by: bhillmer <[email protected]> Co-authored-by: trangl-splunk <[email protected]> Co-authored-by: Joe Malin <[email protected]> Co-authored-by: mbechtold-splunk <[email protected]> Co-authored-by: trangl-splunk <[email protected]> * [DOCS-2512] Org metrics redux (#991) * DOCS-2512: Org metrics updates * Added minimum to def * Added two more metrics * sf.org.datapointsTotalCountByToken * Typo * sf.org.grossDpmContentBytesReceived * Arranged alphabetically * sf.org.log.grossContentBytesReceived WIP * Finalizing batch, reordering lohs * Updates * DRAFT [DOCS-4678] - Org metrics batch A (#992) * [DOCS-4678] - Org metrics batch A See jira. * More updates, WIP * Final updates to Batch A * update docs with splunk.com links (#996) * update docs with splunk.com links * lowercase observability * remove CircleCI, use github actions (#995) * Code review changes from #995 (#997) * code review * Update .github/workflows/test.yml * rename to build-and-test * add sf.org.numDatapointsDroppedInvalidByToken metric (#983) * add sf.org.numDatapointsDroppedInvalidByToken metric * ByToken metric updates * Revert "add sf.org.numDatapointsDroppedInvalidByToken metric (#983)" (#998) This reverts commit 8330ce3. * DOCS-4464: add RUM org metrics (#993) * RUM metrics draft * additions * fixes * chages * fix endpoint * reason decripion * revisions * small fix * Remove typo * remove blank spaces * revisions * add sf.org.numDatapointsDroppedInvalidByToken (#999) * Revert "add sf.org.numDatapointsDroppedInvalidByToken (#999)" (#1003) This reverts commit 9102b6d. * DOC-4606 feedback missing metric (#1004) * add sf.org.numDatapointsDroppedInvalidByToken * add metric with proper indentation * add metric sf.org.log.numMessagesReceivedByToken (#1001) * Removing old metrics (#1006) * DOCS-2512: Org metrics updates (#989) * DOCS-2512: Org metrics updates * Added minimum to def * Added two more metrics * sf.org.datapointsTotalCountByToken * Typo * sf.org.grossDpmContentBytesReceived * Arranged alphabetically * sf.org.log.grossContentBytesReceived WIP * Finalizing batch, reordering lohs * Updates * Revert "DOCS-2512: Org metrics updates (#989)" (#990) This reverts commit 239a202. * Removed old metrics (#1005) See https://signalfuse.atlassian.net/browse/DOCS-5040. * Org metrics update (#1008) * DOCS-2512: Org metrics updates (#989) * DOCS-2512: Org metrics updates * Added minimum to def * Added two more metrics * sf.org.datapointsTotalCountByToken * Typo * sf.org.grossDpmContentBytesReceived * Arranged alphabetically * sf.org.log.grossContentBytesReceived WIP * Finalizing batch, reordering lohs * Updates * Revert "DOCS-2512: Org metrics updates (#989)" (#990) This reverts commit 239a202. * Removed old metrics (#1005) See https://signalfuse.atlassian.net/browse/DOCS-5040. * Updating Org metrics (#1007) * Putting updated metrics back See DOCS-5040. * Removed dimension * [DOCS-4776]: AWS org metrics (#994) * DOCS-4776 New org metrics for AWS * WIP, added info * Final definitions * Org Metrics updates. (#1012) * DOCS-2512: Org metrics updates (#989) * DOCS-2512: Org metrics updates * Added minimum to def * Added two more metrics * sf.org.datapointsTotalCountByToken * Typo * sf.org.grossDpmContentBytesReceived * Arranged alphabetically * sf.org.log.grossContentBytesReceived WIP * Finalizing batch, reordering lohs * Updates * Revert "DOCS-2512: Org metrics updates (#989)" (#990) This reverts commit 239a202. * Removed old metrics (#1005) See https://signalfuse.atlassian.net/browse/DOCS-5040. * Updating Org metrics (#1007) * Putting updated metrics back See DOCS-5040. * Removed dimension * Add new GCP metrics and deprecate old ones (#1010) sf.org.num.gcpStackdriverClientCallCount* are being deprecated and will be removed. Those are being replaced with sf.org.num.gcpServiceClientCallCount* metrics that present more accurate data. * DOCS-5114-removing-metrics (#1011) --------- Co-authored-by: akonarska <[email protected]> * Merging changes in master (#1014) * DOCS-2512: Org metrics updates (#989) * DOCS-2512: Org metrics updates * Added minimum to def * Added two more metrics * sf.org.datapointsTotalCountByToken * Typo * sf.org.grossDpmContentBytesReceived * Arranged alphabetically * sf.org.log.grossContentBytesReceived WIP * Finalizing batch, reordering lohs * Updates * Revert "DOCS-2512: Org metrics updates (#989)" (#990) This reverts commit 239a202. * Removed old metrics (#1005) See https://signalfuse.atlassian.net/browse/DOCS-5040. * Updating Org metrics (#1007) * Putting updated metrics back See DOCS-5040. * Removed dimension * Add new GCP metrics and deprecate old ones (#1010) sf.org.num.gcpStackdriverClientCallCount* are being deprecated and will be removed. Those are being replaced with sf.org.num.gcpServiceClientCallCount* metrics that present more accurate data. * DOCS-5114-removing-metrics (#1011) * DOCS-5114-fix (#1013) --------- Co-authored-by: akonarska <[email protected]> * [DOCS-4679]: Adding more Org metrics (#1009) * [DOCS-4679]: Adding more Org metrics * Added bad calls * Final metrics from batch * Add new Azure metrics and deprecate old ones (#1015) * add sf.org.log.numLogsDroppedIndexThrottle (#1016) * OD4680 More Org metrics (#1022) * DOCS-2512: Org metrics updates (#989) * DOCS-2512: Org metrics updates * Added minimum to def * Added two more metrics * sf.org.datapointsTotalCountByToken * Typo * sf.org.grossDpmContentBytesReceived * Arranged alphabetically * sf.org.log.grossContentBytesReceived WIP * Finalizing batch, reordering lohs * Updates * Revert "DOCS-2512: Org metrics updates (#989)" (#990) This reverts commit 239a202. * Removed old metrics (#1005) See https://signalfuse.atlassian.net/browse/DOCS-5040. * Updating Org metrics (#1007) * Putting updated metrics back See DOCS-5040. * Removed dimension * Add new GCP metrics and deprecate old ones (#1010) sf.org.num.gcpStackdriverClientCallCount* are being deprecated and will be removed. Those are being replaced with sf.org.num.gcpServiceClientCallCount* metrics that present more accurate data. * DOCS-5114-removing-metrics (#1011) * DOCS-5114-fix (#1013) * Update metrics - 4680 - batch C.yaml (#1021) * Update metrics - 4680 - batch C.yaml * Update metrics.yaml WIP * Update metrics.yaml --------- Co-authored-by: akonarska <[email protected]> * Org metrics update - batch D (#1024) * DOCS-2512: Org metrics updates (#989) * DOCS-2512: Org metrics updates * Added minimum to def * Added two more metrics * sf.org.datapointsTotalCountByToken * Typo * sf.org.grossDpmContentBytesReceived * Arranged alphabetically * sf.org.log.grossContentBytesReceived WIP * Finalizing batch, reordering lohs * Updates * Revert "DOCS-2512: Org metrics updates (#989)" (#990) This reverts commit 239a202. * Removed old metrics (#1005) See https://signalfuse.atlassian.net/browse/DOCS-5040. * Updating Org metrics (#1007) * Putting updated metrics back See DOCS-5040. * Removed dimension * Add new GCP metrics and deprecate old ones (#1010) sf.org.num.gcpStackdriverClientCallCount* are being deprecated and will be removed. Those are being replaced with sf.org.num.gcpServiceClientCallCount* metrics that present more accurate data. * DOCS-5114-removing-metrics (#1011) * DOCS-5114-fix (#1013) * Update metrics - 4680 - batch C.yaml (#1021) * Update metrics - 4680 - batch C.yaml * Update metrics.yaml WIP * Update metrics.yaml * Update metrics - batch D.yaml (#1023) * Update metrics - batch D.yaml * Update metrics.yaml * Final metrics from batch --------- Co-authored-by: akonarska <[email protected]> * Removing Reserved note in Org metrics (#1026) * DOCS-2512: Org metrics updates (#989) * DOCS-2512: Org metrics updates * Added minimum to def * Added two more metrics * sf.org.datapointsTotalCountByToken * Typo * sf.org.grossDpmContentBytesReceived * Arranged alphabetically * sf.org.log.grossContentBytesReceived WIP * Finalizing batch, reordering lohs * Updates * Revert "DOCS-2512: Org metrics updates (#989)" (#990) This reverts commit 239a202. * Removed old metrics (#1005) See https://signalfuse.atlassian.net/browse/DOCS-5040. * Updating Org metrics (#1007) * Putting updated metrics back See DOCS-5040. * Removed dimension * Add new GCP metrics and deprecate old ones (#1010) sf.org.num.gcpStackdriverClientCallCount* are being deprecated and will be removed. Those are being replaced with sf.org.num.gcpServiceClientCallCount* metrics that present more accurate data. * DOCS-5114-removing-metrics (#1011) * DOCS-5114-fix (#1013) * Update metrics - 4680 - batch C.yaml (#1021) * Update metrics - 4680 - batch C.yaml * Update metrics.yaml WIP * Update metrics.yaml * Update metrics - batch D.yaml (#1023) * Update metrics - batch D.yaml * Update metrics.yaml * Final metrics from batch * OD5392-removed-reserved (#1025) Removed "reserved" note. --------- Co-authored-by: akonarska <[email protected]> * Update metrics.yaml (#1027) * OD3972-dpm-faqs (#1028) See jira for more details. * update java lib (#1018) * Add missing org metrics per feedback (#1029) * Formatting * Change to fix build failure * Clarify SignalFlow jobs * Eng review --------- Co-authored-by: mbechtold-splunk <[email protected]> Co-authored-by: trangl-splunk <[email protected]> Co-authored-by: Joe Malin <[email protected]> Co-authored-by: Curtis Robert <[email protected]> Co-authored-by: mfoulds-splunk <[email protected]> Co-authored-by: Antoine Toulme <[email protected]> Co-authored-by: Anna U <[email protected]> Co-authored-by: Antoine Toulme <[email protected]> Co-authored-by: gschatz-splunk <[email protected]> Co-authored-by: Tracey <[email protected]> Co-authored-by: akonarska <[email protected]> Co-authored-by: jason plumb <[email protected]> Co-authored-by: trangl <[email protected]>
signalfx · Aug 22, 2023 · 5b15a44 · 5b15a44
1 parent f9c23cf
commit 5b15a44
Show file tree

Hide file tree

Showing 158 changed files with 1,442 additions and 856 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -0,0 +1,27 @@
+name: build-and-test
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+
+jobs:
+ checklinks:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check links
+ uses: gaurav-nelson/github-action-markdown-link-check@v1
+ build-tile:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out the codebase.
+ uses: actions/checkout@v3
+ - uses: actions/setup-python@v4
+ with:
+ python-version: '3.10'
+ cache: 'pip' # caching pip dependencies
+ - name: Install requirements
+ run: pip install -r requirements.txt
+
+ - run: ./build
diff --git a/activemq/SMART_AGENT_MONITOR.md b/activemq/SMART_AGENT_MONITOR.md
@@ -19,7 +19,7 @@ Below is an overview of that monitor.**
 
 
 SignalFx's integration with ActiveMQ wraps the [Collectd GenericJMX
-monitor](https://docs.signalfx.com/en/latest/integrations/agent/monitors/collectd-genericjmx.html)
+monitor](https://docs.splunk.com/observability/gdi/genericjmx/genericjmx.html)
 to monitor ActiveMQ.
 
 Use this monitor to gather the following types of information from ActiveMQ:
@@ -29,7 +29,7 @@ Use this monitor to gather the following types of information from ActiveMQ:
 * Topic (Topic status)
 
 To monitor the age of messages inside ActiveMQ queues, see [ActiveMQ
-message age listener](https://docs.signalfx.com/en/latest/integrations/integrations-reference/integrations.activemq.message.age.listener.html)[](sfx_link:amq-message-age).
+message age listener](https://docs.splunk.com/observability/gdi/activemq/activemq.html)[](sfx_link:amq-message-age).
 
 <!--- SETUP --->
 ## Example config
@@ -100,7 +100,7 @@ The **nested** `values` config object has the following fields:
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/cassandra/SMART_AGENT_MONITOR.md b/cassandra/SMART_AGENT_MONITOR.md
@@ -92,7 +92,7 @@ The **nested** `values` config object has the following fields:
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/check-links b/check-links
diff --git a/collectd-cpu/SMART_AGENT_MONITOR.md b/collectd-cpu/SMART_AGENT_MONITOR.md
@@ -48,7 +48,7 @@ This monitor has no configuration options.
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/consul/SMART_AGENT_MONITOR.md b/consul/SMART_AGENT_MONITOR.md
@@ -85,7 +85,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/docker/SMART_AGENT_MONITOR.md b/docker/SMART_AGENT_MONITOR.md
@@ -68,7 +68,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/etcd/SMART_AGENT_MONITOR.md b/etcd/SMART_AGENT_MONITOR.md
@@ -54,7 +54,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/gitlab/SMART_AGENT_MONITOR.md b/gitlab/SMART_AGENT_MONITOR.md
@@ -195,7 +195,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/hadoop/SMART_AGENT_MONITOR.md b/hadoop/SMART_AGENT_MONITOR.md
@@ -81,7 +81,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/java/SMART_AGENT_MONITOR.md b/java/SMART_AGENT_MONITOR.md
@@ -114,7 +114,7 @@ The easiest thing to do here is to make sure the
 `com.sun.management.jmxremote.rmi.port` property in your Java app is set to
 the same port as the JMX connect port. There may be other variations of
 this that say `Connection reset` or `Connection refused` but they all
-generaly indicate a similar cause.
+generally indicate a similar cause.
 
 
 ## Configuration
@@ -174,7 +174,7 @@ The **nested** `values` config object has the following fields:
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/jenkins/SMART_AGENT_MONITOR.md b/jenkins/SMART_AGENT_MONITOR.md
@@ -95,6 +95,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 | `port` | **yes** | `integer` | |
 | `metricsKey` | **yes** | `string` | Key required for collecting metrics. The access key located at `Manage Jenkins > Configure System > Metrics > ADD.` If empty, click `Generate`. |
 | `enhancedMetrics` | no | `bool` | Whether to enable enhanced metrics (**default:** `false`) |
+| `excludeJobMetrics` | no | `bool` | Set to *true* to exclude job metrics retrieved from `/api/json` endpoint (**default:** `false`) |
 | `includeMetrics` | no | `list of strings` | Used to enable individual enhanced metrics when `enhancedMetrics` is false |
 | `username` | no | `string` | User with security access to jenkins |
 | `apiToken` | no | `string` | API Token of the user |
@@ -107,9 +108,9 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 
 ## Metrics
 
-Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
-(*default*) are ***in bold and italics*** in the list below.
+All metrics of this integration are emitted by default; however, **none are categorized as
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
+-- they are all custom**.
 
 These are the metrics available for this integration.
 

diff --git a/jenkins/smart_agent_config.yaml b/jenkins/smart_agent_config.yaml
@@ -41,7 +41,7 @@ collectd/jenkins:
  type: bool
  yamlName: enhancedMetrics
  - default: 'false'
- doc: Set to *true* to to exclude job metrics retrieved from `/api/json` endpoint
+ doc: Set to *true* to exclude job metrics retrieved from `/api/json` endpoint
  elementKind: ''
  required: false
  type: bool

diff --git a/kafka/SMART_AGENT_MONITOR.md b/kafka/SMART_AGENT_MONITOR.md
@@ -33,7 +33,7 @@ apart from the list of default metrics, kafka.server:type=ZooKeeperClientMetrics
 is a good metric to monitor since it gives an understanding of how long brokers wait for
 requests to Zookeeper to be completed. Since Zookeeper is an integral part of a Kafka cluster,
 monitoring it using the [Zookeeper
-monitor](https://docs.signalfx.com/en/latest/integrations/agent/monitors/collectd-zookeeper.html)[](sfx_link:zookeeper)
+monitor](https://docs.splunk.com/observability/gdi/zookeeper/zookeeper.html)[](sfx_link:zookeeper)
 is recommended. It is also a good idea to monitor disk utilization and network metrics of
 the underlying host.
 
@@ -96,7 +96,7 @@ The **nested** `values` config object has the following fields:
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/kong/SMART_AGENT_MONITOR.md b/kong/SMART_AGENT_MONITOR.md
@@ -173,7 +173,7 @@ The **nested** `metrics` config object has the following fields:
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/lib-java/README.md b/lib-java/README.md
@@ -1,4 +1,4 @@
-# ![](./img/integrations_java.png) Java client library for SignalFx
+# ![](./img/integrations_java.png) Java instrumentation for Splunk Observability Cloud
 
 
 - [Description](#description)
@@ -7,12 +7,14 @@
 
 ### DESCRIPTION
 
-This <a target="_blank" href="https://github.com/signalfx/signalfx-java">repository</a> contains libraries for instrumenting Java applications and reporting metrics to Splunk Infrastructure Monitoring, using Codahale Metrics.
-
-You can also use the module `signalfx-java` to send metrics directly to Splunk Infrastructure Monitoring using protocol buffers, without using Codahale or Yammer metrics.
-
-For more information regarding installation, usage, and examples see https://github.com/signalfx/signalfx-java
+Java instrumentation is available from the
+[Splunk Distribution of OpenTelemetry Java](https://github.com/signalfx/splunk-otel-java). This instrumentation agent provides
+feature-rich auto-instrumentation with very little manual configuration.
+It is built on top of the industry standard [OpenTelemetry](https://opentelemetry.io/).
 
+Users building manual instrumentation can also leverage the 
+[OpenTelemetry Java SDK](https://github.com/open-telemetry/opentelemetry-java)
+to send telemetry to Splunk.
 
 ### LICENSE
 

diff --git a/logstash/SMART_AGENT_MONITOR.md b/logstash/SMART_AGENT_MONITOR.md
@@ -158,7 +158,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/marathon/SMART_AGENT_MONITOR.md b/marathon/SMART_AGENT_MONITOR.md
@@ -22,7 +22,7 @@ Monitors a Mesos Marathon instance using the
 [collectd Marathon Python plugin](https://github.com/signalfx/collectd-marathon).
 
 See the [integrations
-doc](https://docs.signalfx.com/en/latest/integrations/integrations-reference/integrations.marathon.html)
+doc](https://docs.splunk.com/observability/gdi/marathon/marathon.html)
 for more information on configuration.
 
 Sample YAML configuration:
@@ -75,9 +75,9 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 
 ## Metrics
 
-Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
-(*default*) are ***in bold and italics*** in the list below.
+All metrics of this integration are emitted by default; however, **none are categorized as
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
+-- they are all custom**.
 
 These are the metrics available for this integration.
 

diff --git a/memcached/SMART_AGENT_MONITOR.md b/memcached/SMART_AGENT_MONITOR.md
@@ -58,7 +58,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/mongodb-atlas/SMART_AGENT_MONITOR.md b/mongodb-atlas/SMART_AGENT_MONITOR.md
@@ -75,7 +75,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/main/docs/monitor
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/mongodb/SMART_AGENT_MONITOR.md b/mongodb/SMART_AGENT_MONITOR.md
@@ -44,11 +44,31 @@ Documentation for MongoDB can be found [here](http://docs.mongodb.org/manual/).
 
 If you're monitoring a secured MongoDB deployment, it is a good practice to create a MongoDB user with minimal read-only roles, as follows:
 
+If the monitor is configured to send collection level metrics, you need to create and add this role so your user has permission to run collStats and indexStats 
+against system collections and any collection in the db you're monitoring.
+In the below role, we're adding the appropriate permissions for system collections under the admin db.
+For more details on how to add all your non-admin collections, check https://www.mongodb.com/docs/manual/reference/resource-document/
+
+```
+use admin
+db.createRole( 
+ {
+ role: "splunkMonitor",
+ privileges: [ { resource: { db: 'admin', collection: 'system.roles' }, actions: [ 'collStats', 'indexStats' ] },
+ { resource: { db: 'admin', collection: 'system.users' }, actions: [ 'collStats', 'indexStats' ] },
+ { resource: { db: 'admin', collection: 'system.version' }, actions: [ 'collStats', 'indexStats' ] } ],
+ roles: [ { role: "read", db: "admin" } ]
+ },
+ { w: "majority" , wtimeout: 5000 }
+)
+```
+
 ```
+use admin
 db.createUser( {
  user: "collectd",
  pwd: "collectd",
- roles: [ { role: "readAnyDatabase", db: "admin" }, { role: "clusterMonitor", db: "admin" } ]
+ roles: [ { role: "readAnyDatabase", db: "admin" }, { role: "clusterMonitor", db: "admin" }, {role: "splunkMonitor", db: "admin"} ]
 });
 ```
 
@@ -88,7 +108,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/nginx/SMART_AGENT_MONITOR.md b/nginx/SMART_AGENT_MONITOR.md
@@ -63,7 +63,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.

diff --git a/openstack/SMART_AGENT_MONITOR.md b/openstack/SMART_AGENT_MONITOR.md
@@ -83,7 +83,7 @@ Configuration](https://github.com/signalfx/signalfx-agent/tree/master/docs/monit
 ## Metrics
 
 Metrics that are categorized as
-[container/host](https://docs.signalfx.com/en/latest/admin-guide/usage.html#about-custom-bundled-and-high-resolution-metrics)
+[container/host](https://docs.splunk.com/observability/admin/subscription-usage/monitor-imm-billing-usage.html#about-custom-bundled-and-high-resolution-metrics)
 (*default*) are ***in bold and italics*** in the list below.
 
 These are the metrics available for this integration.