Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Commit cb4224a

Browse files
Merge branch 'main' into patch-2
2 parents 999ba33 + 668cd23 commit cb4224a

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

gdi/opentelemetry/collector-kubernetes/kubernetes-support.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ In addition, include the following information:
3333
* Kubernetes version.
3434
* Managed or on premises: if managed, which cloud provider and distribution?
3535

36+
* ConfigMaps from problematic pods:
37+
38+
* ``kubectl get cm my-splunk-otel-collector-agent -o yaml > my-splunk-otel-collector-agent-cm.yaml``
39+
* ``kubectl get cm my-splunk-otel-collector-k8s-cluster-receiver -o yaml > my-splunk-otel-collector-k8s-cluster-receiver-cm.yaml``
40+
3641
* Logs from problematic pods:
3742

3843
* ``kubectl logs my-splunk-otel-collector-agent-fzn4q otel-collector > my-splunk-otel-collector-agent.log``

gdi/opentelemetry/components/oracledb-receiver.rst

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ configuration file, as shown in the following example:
5757
receivers:
5858
oracledb:
5959
# Refer to Oracle Go Driver go_ora documentation for full connection string options
60-
datasource: "oracle://<user>:<password>@<host>:<port>/<database>"
60+
datasource: "oracle://<username>:<password>@<host>:<port>/<database>"
6161
6262
To add more than one instance of Oracle Database, add as many entries of
6363
the ``oracledb`` receiver as needed. For example:
@@ -67,11 +67,11 @@ the ``oracledb`` receiver as needed. For example:
6767
receivers:
6868
oracledb/aninstance:
6969
# Refer to Oracle Go Driver go_ora documentation for full connection string options
70-
datasource: "oracle://<user>:<password>@<host>:<port>/<database>"
70+
datasource: "oracle://<username>:<password>@<host>:<port>/<database>"
7171
7272
oracledb/anotherinstance:
7373
# Refer to Oracle Go Driver go_ora documentation for full connection string options
74-
datasource: "oracle://<user>:<password>@<host>:<port>/<database>"
74+
datasource: "oracle://<username>:<password>@<host>:<port>/<database>"
7575
7676
To complete the configuration, include the receiver in the ``metrics`` pipeline of the ``service`` section of your
7777
configuration file. For example:
@@ -84,6 +84,15 @@ configuration file. For example:
8484
receivers:
8585
- oracledb
8686
87+
To configure the Oracle Database receiver for high availability use:
88+
89+
.. code:: yaml
90+
91+
receivers:
92+
oracledb:
93+
# Refer to Oracle Go Driver go_ora documentation for full connection string options
94+
datasource: "oracle://<username>:<password>@<host>:<port>/<service_name>?<server>=<host>:<port>"
95+
8796
Settings
8897
======================
8998

metrics-and-metadata/search.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ You can either search a specific term, or define what type of object you're look
6363
:width: 100%
6464
:alt: Search results for "“checkoutservice".
6565

66-
#. (Optional) You can narrow the search to specific types of results using the following supported prefixes. Use prefeixes to focus search results to a single category. For details, see :ref:`prefix`.
66+
#. (Optional) You can narrow the search to specific types of results using the following supported prefixes. Use prefixes to focus search results to a single category. For details, see :ref:`prefix`.
6767
#. (Optional) Select a "more results" link to see more matching results in the search category.
6868
#. Select one of the search results to be taken to that object.

sp-oncall/spoc-integrations/slack-integration-guide.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ You must be a Slack administrator to configure this integration. If you prefer n
2222

2323
.. caution:: Deactivate the old Slack (webhook) integration prior to activating the Slack integration.
2424

25+
In Splunk On-Call, you must have either Global or Alert Admin permissions to set up and adjust this integration.
2526

2627
Slack configuration
2728
==========================

0 commit comments

Comments
 (0)