Merge branch 'jenkins-build-12' into 'master'
Auto-merge for build 12 See merge request puppet/prometheus_cd!11
This commit is contained in:
@@ -116,7 +116,7 @@
|
|||||||
<span class='type'>(<tt>String</tt>)</span>
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
<em class="default">(defaults to: <tt>'prometheus'</tt>)</em>
|
<em class="default">(defaults to: <tt>'prometheus2'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
—
|
—
|
||||||
@@ -233,7 +233,7 @@
|
|||||||
|
|
||||||
class prometheus_cd::params (
|
class prometheus_cd::params (
|
||||||
|
|
||||||
String $reqpackage_prom = 'prometheus',
|
String $reqpackage_prom = 'prometheus2',
|
||||||
String $reqpackage_ne = 'node_exporter',
|
String $reqpackage_ne = 'node_exporter',
|
||||||
String $pkg_ensure = 'present',
|
String $pkg_ensure = 'present',
|
||||||
Boolean $manage_prometheus = false,
|
Boolean $manage_prometheus = false,
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
class prometheus_cd::params (
|
class prometheus_cd::params (
|
||||||
|
|
||||||
String $reqpackage_prom = 'prometheus',
|
String $reqpackage_prom = 'prometheus2',
|
||||||
String $reqpackage_ne = 'node_exporter',
|
String $reqpackage_ne = 'node_exporter',
|
||||||
String $pkg_ensure = 'present',
|
String $pkg_ensure = 'present',
|
||||||
Boolean $manage_prometheus = false,
|
Boolean $manage_prometheus = false,
|
||||||
|
|||||||
Reference in New Issue
Block a user