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

Commit 9ccda76

Browse files
Merge pull request #1712 from splunk/repo-sync
Pulling refs/heads/main into main
2 parents ef84cac + 8649c32 commit 9ccda76

File tree

13 files changed

+33
-82
lines changed

13 files changed

+33
-82
lines changed

_includes/gdi/troubleshoot-zeroconfig-k8s.rst

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@ Examine logs to make sure that the operator and cert manager are working.
2121
* ``kubectl logs -l app=cainjector``
2222
* ``kubectl logs -l app=webhook``
2323

24-
Resolve certificate manager issues
25-
----------------------------------------
26-
27-
A hanging operator can indicate issues with the certificate manager.
28-
29-
* Check the logs of your cert-manager pods.
30-
* Restart the cert-manager pods.
31-
* Ensure that your cluster has only one instance of cert-manager. This includes ``certmanager``, ``certmanager-cainjector``, and ``certmanager-webhook``.
32-
33-
See the official cert manager troubleshooting guide for more information: :new-page:`https://cert-manager.io/docs/troubleshooting/`.
34-
3524
Validate certificates
3625
---------------------------
3726

_includes/requirements/collector-linux.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ The Collector supports the following Linux distributions and versions:
22

33
* Amazon Linux: 2, 2023. Log collection with Fluentd is not currently supported for Amazon Linux 2023.
44
* CentOS, Red Hat, or Oracle: 7, 8, 9
5-
* Debian: 9, 10, 11
5+
* Debian: 11, 12
66
* SUSE: 12, 15 for version 0.34.0 or higher. Log collection with Fluentd is not currently supported.
77
* Ubuntu: 16.04, 18.04, 20.04, 22.04, and 24.04
88
* Rocky Linux: 8, 9

admin/authentication/SSO/sso.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ for an Okta login service integration.
8484
</embed>
8585

8686

87-
When you set up SSO, the default role for a user signing in to Splunk Observability Cloud through SSO is the :guilabel:`power` role. You can change the default SSO role to any of the available roles in Splunk Observability Cloud.
87+
When you set up SSO, the default role for a user signing in to Splunk Observability Cloud through SSO is the :guilabel:`power` role. You can change the default SSO role to any of the available roles in Splunk Observability Cloud. These are :guilabel:`admin`, :guilabel:`power`, :guilabel:`usage`, and :guilabel:`read_only`. To learn more about roles, see :ref:`roles-and-capabilities`.
88+
89+
.. note:: Changing the default SSO role affects only new SSO users. If a user already has an existing role defined by the previous default SSO role, you must change it manually. To change a user's role, see :ref:`assign-role-existing`.
8890

8991
To change the default SSO role, do the following:
9092

admin/user-management/roles/users-assign-roles.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ To assign roles when inviting new users, follow these steps:
3939
#. Select :guilabel:`Send Invitation` to confirm.
4040

4141

42+
.. _assign-role-existing:
43+
4244
Assign roles to an existing user
4345
=====================================
4446

@@ -47,7 +49,7 @@ To assign roles to a user that's already a member of your organization, follow t
4749
#. From the left navigation menu, select :menuselection:`Settings` then :menuselection:`Users`.
4850
#. Find the name of the user.
4951
#. Select the :guilabel:`Actions` (|verticaldots|) menu icon next to the username, then select :menuselection:`Manage Roles`.
50-
#. In the :guilabel:`Manage Roles` dialog box, select one or more of the available roles, then select the right-pointing arrow to move the roles to the :guilabel:`Selected Roles` panel.
52+
#. In the :guilabel:`Manage Roles` dialog box, select one or more of the available roles. Make sure to deselect any roles, including the default SSO role, :guilabel:`power`, if you no longer want the user to have that role. Select the right-pointing arrow to move the roles to the :guilabel:`Selected Roles` panel.
5153
#. Select :guilabel:`Assign Roles` to confirm.
5254

5355
.. note:: You can use the :guilabel:`Add All` link to add all available roles to a user.

gdi/opentelemetry/automatic-discovery/k8s/k8s-backend.rst

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,25 +87,14 @@ Populate values.yaml with the following fields and values:
8787
operatorcrds:
8888
install: true
8989
90-
You might need to populate the file with additional values depending on your environment. See :ref:`k8s-auto-discovery-add-certificates` and :ref:`k8s-auto-discovery-setup-traces` for more information.
90+
You might need to populate the file with additional values depending on your environment. See :ref:`k8s-auto-discovery-add-crds` and :ref:`k8s-auto-discovery-setup-traces` for more information.
9191

92-
.. _k8s-auto-discovery-add-certificates:
92+
.. _k8s-auto-discovery-add-crds:
9393

94-
Add certificates and OpenTelemetry CRDs
94+
Add OpenTelemetry CRDs
9595
------------------------------------------
9696

97-
The Operator requires certain TLS certificates to work. Use the following command to check whether a certificate manager is available:
98-
99-
.. code-block:: yaml
100-
101-
# Check if cert-manager is already installed, don't deploy a second cert-manager.
102-
kubectl get pods -l app=certmanager --all-namespaces
103-
104-
If a certificate manager isn't available in the cluster, add ``certmanager.enabled=true`` to your values.yaml file.
105-
106-
The Operator for Kubernetes also requires you to install OpenTelemetry Custom Resource Definitions (CRDs). To do this, add ``operatorcrds.install=true`` to your values.yaml file.
107-
108-
The following example YAML includes ``certmanager.enabled=true`` and ``operatorcrds.install=true``:
97+
The Operator for Kubernetes requires you to install OpenTelemetry Custom Resource Definitions (CRDs). To do this, add ``operatorcrds.install=true`` to your values.yaml file:
10998

11099
.. code-block:: yaml
111100
:emphasize-lines: 7,8
@@ -115,9 +104,7 @@ The following example YAML includes ``certmanager.enabled=true`` and ``operatorc
115104
splunkObservability:
116105
realm: <splunk_realm>
117106
accessToken: <splunk_access_token>
118-
119-
certmanager:
120-
enabled: true
107+
121108
operator:
122109
enabled: true
123110
operatorcrds:
@@ -248,27 +235,23 @@ Verify all the OpenTelemetry resources are deployed successfully
248235

249236
Resources include the Collector, the Operator, webhook, and instrumentation. Run the following commands to verify the resources are deployed correctly.
250237

251-
The pods running in the collector namespace must include the following:
238+
The pods running in the Collector namespace must include the following:
252239

253240
.. code-block:: yaml
254241
255242
kubectl get pods
256243
# NAME READY
257244
# NAMESPACE NAME READY STATUS
258245
# monitoring splunk-otel-collector-agent-lfthw 2/2 Running
259-
# monitoring splunk-otel-collector-cert-manager-6b9fb8b95f-2lmv4 1/1 Running
260-
# monitoring splunk-otel-collector-cert-manager-cainjector-6d65b6d4c-khcrc 1/1 Running
261-
# monitoring splunk-otel-collector-cert-manager-webhook-87b7ffffc-xp4sr 1/1 Running
262246
# monitoring splunk-otel-collector-k8s-cluster-receiver-856f5fbcf9-pqkwg 1/1 Running
263247
# monitoring splunk-otel-collector-opentelemetry-operator-56c4ddb4db-zcjgh 2/2 Running
264248
265-
The webhooks in the collector namespace must include the following:
249+
The webhooks in the Collector namespace must include the following:
266250

267251
.. code-block:: yaml
268252
269253
kubectl get mutatingwebhookconfiguration.admissionregistration.k8s.io
270254
# NAME WEBHOOKS AGE
271-
# splunk-otel-collector-cert-manager-webhook 1 14m
272255
# splunk-otel-collector-opentelemetry-operator-mutation 3 14m
273256
274257
The instrumentation in the collector namespace must include the following:

gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ Now, you need to configure Helm to correctly install the Splunk Distribution of
5353
* - ``environment``
5454
- ``prd`` or your desired environment name
5555
- Tags data that the application sends to Splunk Observability Cloud, allowing you to see the data in Splunk APM
56-
* - ``certmanager.enabled``
57-
- ``true``
58-
- Activates the certification manager for Helm
5956
* - ``operatorcrds.install``
6057
- ``true``
6158
- Installs the CRDs used by the OpenTelemetry Kubernetes Operator

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,6 @@ For the Operator:
255255
operator:
256256
enabled: true
257257
258-
Additionally, deploy the cert-manager for the Operator if it hasn't been already.
259-
260-
.. code-block:: yaml
261-
262-
certmanager:
263-
enabled: true
264-
265258
With the above configuration:
266259

267260
* The Collector is set up to receive profiling data.

gdi/opentelemetry/collector-kubernetes/kubernetes-helm-releases.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Optional releases for subcharts
2626

2727
* :new-page:`https://github.com/open-telemetry/opentelemetry-helm-charts/releases`
2828

29-
* :new-page:`https://github.com/cert-manager/cert-manager/releases`
30-
3129
.. _helm-chart-images:
3230

3331
Helm chart images
@@ -50,11 +48,6 @@ Optional add-on feature images
5048
* :new-page:`https://quay.io/signalfx/splunk-otel-collector-windows`
5149
* :new-page:`https://registry.access.redhat.com`
5250
* :new-page:`https://ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator`
53-
* :new-page:`https://quay.io/jetstack/cert-manager-controller`
54-
* :new-page:`https://quay.io/jetstack/cert-manager-acmesolver`
55-
* :new-page:`https://quay.io/jetstack/cert-manager-webhook`
56-
* :new-page:`https://quay.io/jetstack/cert-manager-cainjector`
57-
* :new-page:`https://quay.io/jetstack/cert-manager-ctl`
5851
* :new-page:`https://ghcr.io/signalfx/splunk-otel-java/splunk-otel-java`
5952
* :new-page:`https://ghcr.io/signalfx/splunk-otel-js/splunk-otel-js`
6053
* :new-page:`https://ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet`

gdi/opentelemetry/collector-kubernetes/metrics-ootb-k8s.rst

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -286,26 +286,6 @@ Pod level metrics and dimensions
286286
-
287287
- Yes
288288

289-
* - ``k8s.statefulset.desired_pods``
290-
- Desired number of StatefulSets in the pod
291-
-
292-
- Yes
293-
294-
* - ``k8s.statefulset.current_pods``
295-
- Current number of StatefulSets in the pod
296-
-
297-
- Yes
298-
299-
* - ``k8s.statefulset.ready_pods``
300-
- Number of ready StatefulSets in the pod
301-
-
302-
- Yes
303-
304-
* - ``k8s.statefulset.updated_pods``
305-
- Number of updated StatefulSets in the pod
306-
-
307-
- Yes
308-
309289
Node level metrics and dimensions
310290
============================================================================
311291

@@ -653,6 +633,18 @@ Other available metrics include:
653633
* - ``k8s.daemonset.ready_nodes``
654634
- Yes
655635

636+
* - ``k8s.statefulset.desired_pods``
637+
- Yes
638+
639+
* - ``k8s.statefulset.current_pods``
640+
- Yes
641+
642+
* - ``k8s.statefulset.ready_pods``
643+
- Yes
644+
645+
* - ``k8s.statefulset.updated_pods``
646+
- Yes
647+
656648
* - ``k8s.hpa.max_replicas``
657649
- Yes
658650

gdi/opentelemetry/collector-linux/deployments-linux-ansible.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.. _linux-ansible:
33

44
********************************************************
5-
Deploy the Collector with Ansible for Linux
5+
Deploy the Collector for Linux with Ansible
66
********************************************************
77

88
.. meta::
@@ -16,7 +16,7 @@ The following Linux distributions and versions are supported:
1616

1717
* Amazon Linux: 2, 2023. Log collection with Fluentd isn't supported for Amazon Linux 2023.
1818
* CentOS, Red Hat, or Oracle: 7, 8, 9
19-
* Debian: 9, 10, 11
19+
* Debian: 11, 12
2020
* SUSE: 12, 15 for Collector version 0.34.0 or higher. Log collection with Fluentd isn't supported.
2121
* Ubuntu: 16.04, 18.04, 20.04, and 22.04
2222

0 commit comments

Comments
 (0)