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

Commit c26e832

Browse files
Merge pull request #1516 from splunk/repo-sync
Pulling refs/heads/main into main
2 parents 16acb6c + 236305e commit c26e832

File tree

7 files changed

+57
-11
lines changed

7 files changed

+57
-11
lines changed

_templates/404.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,18 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
323323
{%- endblock %}
324324

325325
{% block footer %}
326+
<script>
327+
(function(apiKey){
328+
(function(p,e,n,d,o){var v,w,x,y,z;o=p[d]=p[d]||{};o._q=o._q||[];
329+
v=['initialize','identify','updateOptions','pageLoad','track'];for(w=0,x=v.length;w<x;++w)(function(m){
330+
o[m]=o[m]||function(){o._q[m===v[0]?'unshift':'push']([m].concat([].slice.call(arguments,0)));};})(v[w]);
331+
y=e.createElement(n);y.async=!0;y.src='https://cdn.pendo.io/agent/static/'+apiKey+'/pendo.js';
332+
z=e.getElementsByTagName(n)[0];z.parentNode.insertBefore(y,z);})(window,document,'script','pendo');
333+
334+
// This function creates visitors and accounts in Pendo
335+
// You will need to replace <visitor-id-goes-here> and <account-id-goes-here> with values you use in your app
336+
// Please use Strings, Numbers, or Bools for value types.
337+
pendo.initialize();
338+
})('780a75be-e49a-41b4-64ec-2ebf30a068c0');
339+
</script>
326340
{% endblock footer %}

_templates/layout.html

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,4 +325,18 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
325325
{%- endblock %}
326326

327327
{% block footer %}
328-
{% endblock footer %}
328+
<script>
329+
(function(apiKey){
330+
(function(p,e,n,d,o){var v,w,x,y,z;o=p[d]=p[d]||{};o._q=o._q||[];
331+
v=['initialize','identify','updateOptions','pageLoad','track'];for(w=0,x=v.length;w<x;++w)(function(m){
332+
o[m]=o[m]||function(){o._q[m===v[0]?'unshift':'push']([m].concat([].slice.call(arguments,0)));};})(v[w]);
333+
y=e.createElement(n);y.async=!0;y.src='https://cdn.pendo.io/agent/static/'+apiKey+'/pendo.js';
334+
z=e.getElementsByTagName(n)[0];z.parentNode.insertBefore(y,z);})(window,document,'script','pendo');
335+
336+
// This function creates visitors and accounts in Pendo
337+
// You will need to replace <visitor-id-goes-here> and <account-id-goes-here> with values you use in your app
338+
// Please use Strings, Numbers, or Bools for value types.
339+
pendo.initialize();
340+
})('780a75be-e49a-41b4-64ec-2ebf30a068c0');
341+
</script>
342+
{% endblock footer %}

_templates/search.html

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,5 +386,19 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
386386

387387
{%- endblock %}
388388

389-
{% block footer %}
390-
{% endblock footer %}
389+
{% block footer %}
390+
<script>
391+
(function(apiKey){
392+
(function(p,e,n,d,o){var v,w,x,y,z;o=p[d]=p[d]||{};o._q=o._q||[];
393+
v=['initialize','identify','updateOptions','pageLoad','track'];for(w=0,x=v.length;w<x;++w)(function(m){
394+
o[m]=o[m]||function(){o._q[m===v[0]?'unshift':'push']([m].concat([].slice.call(arguments,0)));};})(v[w]);
395+
y=e.createElement(n);y.async=!0;y.src='https://cdn.pendo.io/agent/static/'+apiKey+'/pendo.js';
396+
z=e.getElementsByTagName(n)[0];z.parentNode.insertBefore(y,z);})(window,document,'script','pendo');
397+
398+
// This function creates visitors and accounts in Pendo
399+
// You will need to replace <visitor-id-goes-here> and <account-id-goes-here> with values you use in your app
400+
// Please use Strings, Numbers, or Bools for value types.
401+
pendo.initialize();
402+
})('780a75be-e49a-41b4-64ec-2ebf30a068c0');
403+
</script>
404+
{% endblock footer %}

apm/apm-spans-traces/apm-errors.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ With Splunk APM error detection, you can isolate specific causes of errors in yo
1111

1212
.. _apm-error-detection:
1313

14-
How error spans are detected
14+
How Splunk APM detects error spans
1515
=========================================
1616

17-
Each :term:`span` in Splunk APM captures a single operation. Splunk APM considers a span to be an error span if the operation that the span captures results in an error. A span is considered to be an error span when any of the following conditions are met:
17+
Each :term:`span` in Splunk APM captures a single operation. Splunk APM considers a span to be an error span if the operation that the span captures results in an error as defined by the following conditions:
1818

1919
* The ``otel.status_code`` field for the span is ``ERROR``. ``otel.status_code`` is set in the Splunk Distribution of the OpenTelemetry instrumentation using the native OTel field ``span.status``. ``span.status``, and subsequently ``otel.status_code``, are set based on either the HTTP status code or the gRPC status code.
2020

21-
* See :ref:`apm-http-status` to learn which ``http.status_code`` tag values set ``otel.status_code`` to ``ERROR`` in the OpenTelemetry instrumentation.
21+
* See :ref:`apm-http-status` to learn which status code values set ``otel.status_code`` to ``ERROR`` in the OpenTelemetry instrumentation.
2222
* See :ref:`apm-grpc-status` to learn which ``rpc.grpc.status_code`` tag values set ``otel.status_code`` to ``ERROR`` in the OpenTelemetry instrumentation.
2323
* The ``error`` tag for the span is set to a truthy value, which is any value other than ``False`` or ``0``.
2424

@@ -204,8 +204,8 @@ However, depending on your application's logic, a ``4xx`` status code might repr
204204

205205
For example, if Kai wants to alert on the rate of ``401`` errors returned by a given service, they do the following:
206206

207-
1. Index ``http.status_code``. See :ref:`apm-index-span-tags`.
208-
2. Create a custom Monitoring MetricSet on ``http.status_code`` for the service's endpoints to get a time series for each status code. See :ref:`cmms`.
207+
1. Index ``http.status_code`` in libraries that support OpenTelemetry semantic conventions version 1.16.0 or lower. Or index ``http.response.status_code`` in libraries that support OpenTelemetry semantic conventions version 1.17.0 or higher. See :ref:`apm-index-span-tags`.
208+
2. Create a custom Monitoring MetricSet on the status code tag for the service's endpoints to get a time series for each status code. See :ref:`cmms`.
209209
3. Set up an alert on the rate of ``401`` errors as compared to all requests. See :ref:`apm-alerts`.
210210

211211
.. _5xx-error-logic:

gdi/get-data-in/connect/gcp/gcp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ The following table specifies the permissions required for GCP integrations:
9393
- Yes
9494

9595
* - ``resourcemanager.projects.get``
96-
- Yes, if you want to sync project metadata (such as labels), or if you need to obtain metrics from monitored projects of a scoping project
96+
- Yes, if you want to sync project metadata (such as labels)
9797

9898
* - ``serviceusage.services.use``
9999
- Yes, if you want to activate the use of a quota from the project where metrics are stored

gdi/monitors-network/dns.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ configuration:
3838
type: telegraf/dns
3939
... # Additional config
4040
41+
.. note:: Make sure to include the required ``servers`` configuration setting. See the following section, :strong:`Configuration settings`, for more information.
42+
4143
Next, add the monitor to the ``service.pipelines.metrics.receivers``
4244
section of your configuration file:
4345

@@ -48,6 +50,8 @@ section of your configuration file:
4850
metrics:
4951
receivers: [smartagent/dns]
5052
53+
.. _config-settings:
54+
5155
Configuration settings
5256
~~~~~~~~~~~~~~~~~~~~~~
5357

get-started/support.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Create a Splunk account
5656

5757
1. Go to the :new-page:`Create Your Account page <https://www.splunk.com/page/sign_up>` and complete the form to register for a Splunk account. Make sure to sign up using your business email address.
5858

59-
2. Check your email for a message from Splunk asking you to verify your email address. You must click the link in the email to verify your email address within 7 days or your account creation request expires. If you don't see the email in your inbox, make sure to check your spam folder.
59+
2. Check your email for a message from Splunk asking you to verify your email address. You must select the link in the email to verify your email address within 7 days or your account creation request expires. If you don't see the email in your inbox, make sure to check your spam folder.
6060

6161
3. Select the verification link in the email to access a page where you can log in to your Splunk account.
6262

@@ -68,7 +68,7 @@ Create a Splunk account
6868

6969
5. To check on the status of your entitlements:
7070

71-
1. Access the :new-page:`Splunk Support Portal <https://splunk.my.site.com/customer/s/`.
71+
1. Access the :new-page:`Splunk Support Portal <https://splunk.my.site.com/customer/s/>`.
7272

7373
2. In the navigation menu, select :guilabel:`My Entitlements`.
7474

0 commit comments

Comments
 (0)