Skip to content

Commit

Permalink
(maint) correct lint and travis errors
Browse files Browse the repository at this point in the history
  • Loading branch information
tkishel committed Mar 17, 2020
1 parent 169759f commit 9865135
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion manifests/pe_metric.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
$metric_script_file_path = "${puppet_metrics_collector::scripts_dir}/${metric_script_file}"
$conversion_script_file_path = "${puppet_metrics_collector::scripts_dir}/json2timeseriesdb"

# lint:ignore:140chars
if empty($override_metrics_command) {
$base_metrics_command = "${metric_script_file_path} --metrics_type ${metrics_type} --output_dir ${metrics_output_dir}"

Expand Down Expand Up @@ -79,10 +80,10 @@
} else {
$metrics_command = "${base_metrics_command} --no-print"
}

} else {
$metrics_command = $override_metrics_command
}
# lint:endignore

cron { "${metrics_type}_metrics_collection" :
ensure => $metric_ensure,
Expand Down
2 changes: 2 additions & 0 deletions manifests/service/activemq.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
Optional[Integer] $metrics_server_port = $puppet_metrics_collector::metrics_server_port,
Optional[String] $metrics_server_db_name = $puppet_metrics_collector::metrics_server_db_name,
) {
# lint:ignore:140chars
$additional_metrics = [
{
'type' => 'read',
Expand Down Expand Up @@ -49,6 +50,7 @@
'attribute' => 'AverageBlockedTime,AverageEnqueueTime,AverageMessageSize,ConsumerCount,DequeueCount,DispatchCount,EnqueueCount,ExpiredCount,ForwardCount,InFlightCount,ProducerCount,QueueSize',
},
]
# lint:endignore

file { "${puppet_metrics_collector::scripts_dir}/amq_metrics" :
ensure => $metrics_ensure,
Expand Down
2 changes: 1 addition & 1 deletion manifests/service/puppetdb.pp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
}
]

$version = {'catalogs' => 9, 'facts' => 5, 'reports' => 8},
$version = {'catalogs' => 9, 'facts' => 5, 'reports' => 8}

$version_specific_metrics = [
{
Expand Down

0 comments on commit 9865135

Please sign in to comment.