Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
puppet-modules
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nbits
Puppet
puppet-modules
Commits
734b676e
Commit
734b676e
authored
Aug 3, 2021
by
drebs
Browse files
Options
Downloads
Patches
Plain Diff
Configure Backports for Icinga2 in Buster
parent
68a53c4b
Branches
fix-monitoring-plugins-contrib-installation
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#63099
passed
Aug 4, 2021
Stage: check-code
Stage: tests
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
profile/manifests/monitoring.pp
+7
-0
7 additions, 0 deletions
profile/manifests/monitoring.pp
profile/manifests/monitoring/agent.pp
+0
-2
0 additions, 2 deletions
profile/manifests/monitoring/agent.pp
profile/manifests/monitoring/server.pp
+0
-2
0 additions, 2 deletions
profile/manifests/monitoring/server.pp
with
7 additions
and
4 deletions
profile/manifests/monitoring.pp
+
7
−
0
View file @
734b676e
...
@@ -2,5 +2,12 @@
...
@@ -2,5 +2,12 @@
class
profile::monitoring
(
class
profile::monitoring
(
Enum
[
'agent'
,
'server'
]
$type
=
'agent'
,
Enum
[
'agent'
,
'server'
]
$type
=
'agent'
,
)
{
)
{
# XXX Some monitoring packages are not present in Debian Buster repository.
# This can be removed once nodes are upgraded to Bullseye.
include
apt::backports
include
profile::monitoring::packages
class
{
"profile::monitoring::
${type}
"
:
}
class
{
"profile::monitoring::
${type}
"
:
}
}
}
This diff is collapsed.
Click to expand it.
profile/manifests/monitoring/agent.pp
+
0
−
2
View file @
734b676e
...
@@ -5,8 +5,6 @@ class profile::monitoring::agent (
...
@@ -5,8 +5,6 @@ class profile::monitoring::agent (
String
$ticket_salt
=
lookup
(
'profile::monitoring::ticket_salt'
,
String
,
'first'
,
'changeme!'
),
String
$ticket_salt
=
lookup
(
'profile::monitoring::ticket_salt'
,
String
,
'first'
,
'changeme!'
),
)
{
)
{
include
profile::monitoring::packages
class
{
'::icinga2'
:
class
{
'::icinga2'
:
features
=>
[
'mainlog'
],
features
=>
[
'mainlog'
],
constants
=>
{
constants
=>
{
...
...
This diff is collapsed.
Click to expand it.
profile/manifests/monitoring/server.pp
+
0
−
2
View file @
734b676e
...
@@ -12,8 +12,6 @@ class profile::monitoring::server (
...
@@ -12,8 +12,6 @@ class profile::monitoring::server (
Boolean
$tls
=
false
,
Boolean
$tls
=
false
,
)
{
)
{
include
profile::monitoring::packages
# set up the database
# set up the database
include
::mysql::server
include
::mysql::server
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment