Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b0d5f0b3
Commit
b0d5f0b3
authored
Jul 15, 2020
by
Amy Qualls
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docs-add-prometheus-iap-feature' into 'master'
Add prometheus IAP docs See merge request gitlab-org/gitlab!36864
parents
b9dff9cd
f458490a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
doc/user/project/integrations/img/prometheus_manual_configuration_v13_2.png
...ntegrations/img/prometheus_manual_configuration_v13_2.png
+0
-0
doc/user/project/integrations/img/prometheus_service_configuration.png
...ect/integrations/img/prometheus_service_configuration.png
+0
-0
doc/user/project/integrations/prometheus.md
doc/user/project/integrations/prometheus.md
+15
-5
No files found.
doc/user/project/integrations/img/prometheus_manual_configuration_v13_2.png
0 → 100644
View file @
b0d5f0b3
15.3 KB
doc/user/project/integrations/img/prometheus_service_configuration.png
deleted
100644 → 0
View file @
b9dff9cd
4.9 KB
doc/user/project/integrations/prometheus.md
View file @
b0d5f0b3
...
@@ -99,14 +99,24 @@ Installing and configuring Prometheus to monitor applications is fairly straight
...
@@ -99,14 +99,24 @@ Installing and configuring Prometheus to monitor applications is fairly straight
The actual configuration of Prometheus integration within GitLab is very simple.
The actual configuration of Prometheus integration within GitLab is very simple.
All you will need is the domain name or IP address of the Prometheus server you'd like
All you will need is the domain name or IP address of the Prometheus server you'd like
to integrate with.
to integrate with. If the Prometheus resource is secured with Google's Identity-Aware Proxy (IAP),
additional information like Client ID and Service Account credentials can be passed which
1.
Navigate to the
[
Integrations page
](
overview.md#accessing-integrations
)
.
GitLab can use to access the resource. More information about authentication from a
service account can be found at Google's documentation for
[
Authenticating from a service account
](
https://cloud.google.com/iap/docs/authentication-howto#authenticating_from_a_service_account
)
.
1.
Navigate to the
[
Integrations page
](
overview.md#accessing-integrations
)
at
**{settings}**
**Settings > Integrations**
.
1.
Click the
**Prometheus**
service.
1.
Click the
**Prometheus**
service.
1.
Provide the domain name or IP address of your server, for example
`http://prometheus.example.com/`
or
`http://192.0.2.1/`
.
1.
For
**API URL**
, provide the domain name or IP address of your server, such as
`http://prometheus.example.com/`
or
`http://192.0.2.1/`
.
1.
(Optional) In
**Google IAP Audience Client ID**
, provide the Client ID of the
Prometheus OAuth Client secured with Google IAP.
1.
(Optional) In
**Google IAP Service Account JSON**
, provide the contents of the
Service Account credentials file that is authorized to access the Prometheus resource.
1.
Click
**Save changes**
.
1.
Click
**Save changes**
.
![
Configure Prometheus Service
](
img/prometheus_
service_configuration
.png
)
![
Configure Prometheus Service
](
img/prometheus_
manual_configuration_v13_2
.png
)
#### Thanos configuration in GitLab
#### Thanos configuration in GitLab
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment