.gitignore

@@ -16,11 +16,3 @@ bin/*
 .kitchen.local.yml
 
 .cookbook_version
-.gitignore
-.RETRYABLE_KITCHEN_TASK
-.env
-.kitchen.ec2.yml
-.kitchen.yml
-bundler/
-cache/
-

.kitchen.ec2.yml

@@ -0,0 +1,42 @@
+---
+# The following environment variables are required:
+# - AWS_ACCESS_KEY_ID
+# - AWS_SECRET_ACCESS_KEY
+# - AWS_SSH_KEY_ID
+# - AWS_REGION
+#
+# Optional environment variables:
+# - AWS_SECURITY_GROUP
+# - AWS_SUBNET
+# - KITCHEN_NO_CONCURRENCY set it to true if you do not want concurrency
+
+driver:
+  name: ec2
+  instance_type: t2.micro
+  associate_public_ip: true
+  iam_profile_name: test-kitchen
+  region: <%= ENV['AWS_REGION'] || 'us-west-2' %>
+  tags:
+    created-by: <%= ENV['AWS_SSH_KEY_ID'] %>
+  subnet_filter:
+    tag:   'Name'
+    value: <%= ENV['AWS_SUBNET'] || 'chef-testing-opensource-vpc-subnet' %>
+  security_group_filter:
+    tag:   'Name'
+    value: <%= ENV['AWS_SECURITY_GROUP'] || 'chef-testing-opensource-vpc-security-group' %>
+  block_device_mappings:
+    - device_name: /dev/sda1
+      ebs:
+        volume_type: gp2
+        delete_on_termination: true
+
+transport:
+  ssh_key: <%= ENV['HOME'] %>/.ssh/id_rsa
+
+platforms:
+  - name: centos-7
+    driver:
+      image_id: ami-d2c924b2
+
+suites:
+<%= require 'erubis'; Erubis::Eruby.new(File.read('.kitchen_suites.yml')).evaluate %>

.rubocop.yml

@@ -4,7 +4,7 @@
 # - submit the change in the code_generator
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 
 
 # This requires to alphabetically sort Gem's requirements
@@ -23,7 +23,9 @@ Metrics/LineLength:
 # Based on data from http://sideeffect.kr/popularconvention#ruby
 #
 ### Comma after each line in a list
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 # It is very common to add key/value pairs to hashes in Chef attributes. Making
 # sure each line has a comma diminishes the chance of someone making an error

.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 cache: bundler
 rvm:
-- 2.3.2
+- 2.4.0
 deploy:
   skip_cleanup: true
-  edge: true
   edge:
     source: criteo-forks/dpl
     branch: chef_ruby2

Berksfile

@@ -1,4 +1,6 @@
 source 'https://supermarket.chef.io'
+
+
 cookbook 'kitchen-ohai' # required for ec2
 
 metadata

Gemfile

@@ -18,4 +18,4 @@ group :ec2 do
 end
 
 # Other gems should go after this comment
-gem 'rubocop', '=0.51.0'
+gem 'rubocop', '=0.61.1'

attributes/default.rb

@@ -4,6 +4,9 @@
 default['mariadb']['user_librenms']['password'] = 'default'
 default['mariadb']['bind_address'] = '127.0.0.1'
 default['mariadb']['max_connections'] = 302
+default['mariadb']['max_connect_errors'] = 1000
+default['mariadb']['wait_timeout'] = 600
+default['mariadb']['datadir'] = '/var/lib/mysql'
 
 default['librenms']['root_dir'] = '/var/opt'
 default['librenms']['path'] = ::File.join(node['librenms']['root_dir'], 'librenms')
@@ -49,10 +52,13 @@
 default['librenms']['repo_opennms']['gpgkey'] = 'https://yum.opennms.org/OPENNMS-GPG-KEY'
 default['yum']['epel']['enabled'] = true
 
+# package option
+default['librenms']['package']['default_action'] = :install
+
 # downloading librenms
 default['librenms']['install']['url'] = 'https://github.com/librenms/librenms/archive/'
-default['librenms']['install']['version'] = '1.35'
-default['librenms']['install']['checksum'] = '72019d9b58b145b617b1e9bfe7f39bd01c9fe5c254e561ef0c80b0a3eb56ac3f'
+default['librenms']['install']['version'] = '1.46'
+default['librenms']['install']['checksum'] = '0583bf4ccca54f65ed9287d1848d4bfc3f8343e9311907dcfe46932932e6b704'
 # override this with the proper archive checksum if you install a
 # specific version and care about checksums.
 default['librenms']['install']['checksum'] = nil
@@ -94,6 +100,7 @@
 default['librenms']['rrdcached']['enabled'] = false
 default['librenms']['rrdcached']['config_file'] = '/etc/sysconfig/rrdcached'
 default['librenms']['rrdcached']['options'] = '-w 1800 -z 1800 -f 3600 -B -R -j /var/tmp -l unix:/var/run/rrdcached/rrdcached.sock -t 4 -F'
+default['librenms']['rrdcached']['binary_path'] = '/usr/bin/rrdcached'
 
 # autodiscover switches
 default['librenms']['autodiscover']['xdp'] = false
@@ -128,3 +135,11 @@
 
 # Syslog
 default['librenms']['syslog']['enabled'] = false
+
+# Cleanup options
+default['librenms']['syslog_purge'] = 30
+default['librenms']['eventlog_purge'] = 30
+default['librenms']['authlog_purge'] = 30
+default['librenms']['device_perf_purge'] = 7
+default['librenms']['rrd_purge'] = false
+default['librenms']['ports_purge'] = false

metadata.rb

@@ -1,17 +1,18 @@
-name 'librenms'
-maintainer 'Criteo'
+name             'librenms'
+maintainer       'Criteo'
 maintainer_email 'use_github_issues@criteo.com'
-license 'Apache-2.0'
-description 'Installs/Configures librenms'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.2.23'
-supports 'centos7'
-
-source_url 'https://github.com/criteo-cookbooks/librenms' if respond_to?(:source_url)
-issues_url 'https://github.com/criteo-cookbooks/librenms/issues' if respond_to?(:issues_url)
-
-depends	'apache2'
-depends	'logrotate'
-depends 'yum-epel'
-depends 'ark'
-chef_version '>= 12.5' if respond_to?(:chef_version)
+license          'Apache-2.0'
+description      'Installs/Configures librenms'
+long_description 'This cookbook installs and configure LibreNMS along with the required components (Apache and MySQL). LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system.'
+issues_url       'https://github.com/criteo-cookbooks/librenms/issues'
+source_url       'https://github.com/criteo-cookbooks/librenms'
+version          '0.2.29'
+chef_version     '>= 12.14.34'
+supports         'centos7'
+supports         'centos'
+depends          'apache2'
+depends          'logrotate'
+depends          'yum-epel'
+depends          'ark'
+depends          'facl'
+depends          'poise-python'