diff --git a/_includes/application-receiver-table.rst b/_includes/application-receiver-table.rst index dd63a4c13..81c97c48e 100644 --- a/_includes/application-receiver-table.rst +++ b/_includes/application-receiver-table.rst @@ -358,11 +358,6 @@ - :strong:`X` - - - * - :ref:`Mesos Marathon ` - - :strong:`X` - - - - - * - :ref:`Microsoft .NET ` - :strong:`X` - diff --git a/_includes/gdi/processor-architecture-subprocess.rst b/_includes/gdi/processor-architecture-subprocess.rst index c16657131..8841854af 100644 --- a/_includes/gdi/processor-architecture-subprocess.rst +++ b/_includes/gdi/processor-architecture-subprocess.rst @@ -159,11 +159,6 @@ - Yes - Experimental - No - * - ``collectd/marathon`` - - Yes - - Yes - - Experimental - - No * - ``collectd/mongodb`` - Yes - Yes diff --git a/gdi/monitors-gitlab/gitlab.rst b/gdi/monitors-gitlab/gitlab.rst index 03397d748..835ef89a1 100644 --- a/gdi/monitors-gitlab/gitlab.rst +++ b/gdi/monitors-gitlab/gitlab.rst @@ -48,11 +48,10 @@ Installation GitLab configuration -------------------- -Follow the instructions on Monitoring GitLab with -Prometheus](https://docs.gitlab.com/ee/administration/monitoring/prometheus/index.html) +Follow the instructions on :new-page:`Monitoring GitLab with +Prometheus ` to configure the GitLab Prometheus exporters to expose metric endpoint -targets. For the GitLab Runner monitoring configuration, see [GitLab -Runner monitoring. +targets. If you configue GitLab by editing ``/etc/gitlab/gitlab.rb``, you need to run the command ``gitlab-ctl reconfigure`` for the changes to take diff --git a/gdi/monitors-orchestration/mesos-marathon.rst b/gdi/monitors-orchestration/mesos-marathon.rst deleted file mode 100644 index 6cc76b67e..000000000 --- a/gdi/monitors-orchestration/mesos-marathon.rst +++ /dev/null @@ -1,138 +0,0 @@ -.. _marathon: - -Mesos Marathon -================= - -.. meta:: - :description: Use this Splunk Observability Cloud integration for the Marathon monitor. See benefits, install, configuration, and metrics - -The -:ref:`Splunk Distribution of OpenTelemetry Collector ` -uses the :ref:`Smart Agent receiver ` with the -Mesos Marathon monitor type to monitor a Mesos Marathon instance using -the Marathon Python plugin. - -This integration is only available on Kubernetes and Linux. - -Benefits --------- - -.. include:: /_includes/benefits.rst - -Installation ------------- - -.. include:: /_includes/collector-installation-linux.rst - -Configuration -------------- - -.. include:: /_includes/configuration.rst - -Example -~~~~~~~ - -To activate this integration, add the following to your Collector -configuration: - -.. code-block:: yaml - - receivers: - smartagent/marathon: - type: collectd/marathon - ... # Additional config - -Next, add the monitor to the ``service.pipelines.metrics.receivers`` -section of your configuration file: - -.. code-block:: yaml - - service: - pipelines: - metrics: - receivers: [smartagent/marathon] - -Configuration settings -~~~~~~~~~~~~~~~~~~~~~~ - -The following table shows the configuration options for the Mesos -Marathon monitor: - -.. list-table:: - :widths: 18 18 18 18 - :header-rows: 1 - - - - - - Option - - Required - - Type - - Description - - - - - ``pythonBinary`` - - no - - ``string`` - - Path to a python binary that should be used to execute the - Python code. If not set, a built-in runtime will be used. Can - include arguments to the binary as well. - - - - - ``host`` - - **yes** - - ``string`` - - Host of the exporter - - - - - ``port`` - - **yes** - - ``integer`` - - Port of the exporter - - - - - ``username`` - - no - - ``string`` - - Username used to authenticate with Marathon. - - - - - ``password`` - - no - - ``string`` - - Password used to authenticate with Marathon. - - - - - ``scheme`` - - no - - ``string`` - - Set to either ``http`` or ``https``. (**default:** ``http``) - - - - - ``dcosAuthURL`` - - no - - ``string`` - - The dcos authentication URL that the plugin uses to get - authentication tokens from. Set scheme to “https” if operating - DC/OS in strict mode and dcosAuthURL to - “https://leader.mesos/acs/api/v1/auth/login” (which is the - default DNS entry provided by DC/OS) - -Metrics -------- - -The following metrics are available for this integration: - -.. raw:: html - -
- - -Notes -~~~~~ - -.. include:: /_includes/metric-defs.rst - -Troubleshooting ---------------- - -.. include:: /_includes/troubleshooting-components.rst diff --git a/gdi/orchestration.rst b/gdi/orchestration.rst index ee79cccd9..e9c6688d6 100644 --- a/gdi/orchestration.rst +++ b/gdi/orchestration.rst @@ -21,7 +21,6 @@ Configure application receivers for orchestration monitors-orchestration/kubernetes-proxy monitors-orchestration/kubernetes-scheduler opentelemetry/components/kubelet-stats-receiver - monitors-orchestration/mesos-marathon monitors-orchestration/openshift-cluster These application receivers gather metrics from their associated orchestration-related applications and the hosts the applications are running on. @@ -36,5 +35,6 @@ These application receivers gather metrics from their associated orchestration-r * :ref:`kubernetes-proxy` * :ref:`kubernetes-scheduler` * :ref:`kubelet-stats-receiver` -* :ref:`marathon` * :ref:`openshift-cluster` + +.. note:: The Mesos Marathon integration is no longer supported.