Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pulling refs/heads/main into main #1125

Merged
merged 7 commits into from
Jan 11, 2024
Merged

Pulling refs/heads/main into main #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ffff62f
Merge pull request #1647 from splunk/repo-sync
theletterf Jan 10, 2024
2f41d78
fix link to gitlab docs
atoulme Jan 11, 2024
90e6f32
Update gitlab.rst
aurbiztondo-splunk Jan 11, 2024
6646869
Removed in arch
aurbiztondo-splunk Jan 11, 2024
8afdc83
Removed Mesos
aurbiztondo-splunk Jan 11, 2024
ea89966
Merge pull request #1651 from splunk/urbiz-OD5942-mesos-marathon
aurbiztondo-splunk Jan 11, 2024
96653d7
Merge pull request #1650 from atoulme/fix_link
aurbiztondo-splunk Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions _includes/application-receiver-table.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,6 @@
- :strong:`X`
-
-
* - :ref:`Mesos Marathon <marathon>`
- :strong:`X`
-
-

* - :ref:`Microsoft .NET <microsoft-dotnet>`
- :strong:`X`
-
Expand Down
5 changes: 0 additions & 5 deletions _includes/gdi/processor-architecture-subprocess.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,6 @@
- Yes
- Experimental
- No
* - ``collectd/marathon``
- Yes
- Yes
- Experimental
- No
* - ``collectd/mongodb``
- Yes
- Yes
Expand Down
7 changes: 3 additions & 4 deletions gdi/monitors-gitlab/gitlab.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://docs.gitlab.com/ee/administration/monitoring/prometheus/index.html>`
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
Expand Down
138 changes: 0 additions & 138 deletions gdi/monitors-orchestration/mesos-marathon.rst
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions gdi/orchestration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.