Merge pull request #586 from Ordnaxz/historyindexcachesize2

Added historyindexcachesize to class zabbix (part2)

Author: bastelfreak

manifests/init.pp

@@ -146,6 +146,7 @@
   $cacheupdatefrequency                     = $zabbix::params::server_cacheupdatefrequency,
   $startdbsyncers                           = $zabbix::params::server_startdbsyncers,
   $historycachesize                         = $zabbix::params::server_historycachesize,
+  Zabbix::Historyics $historyindexcachesize = $zabbix::params::server_historyindexcachesize,
   $trendcachesize                           = $zabbix::params::server_trendcachesize,
   $historytextcachesize                     = $zabbix::params::server_historytextcachesize,
   $valuecachesize                           = $zabbix::params::server_valuecachesize,
@@ -270,6 +271,7 @@
     historycachesize          => $historycachesize,
     trendcachesize            => $trendcachesize,
     historytextcachesize      => $historytextcachesize,
+    historyindexcachesize     => $historyindexcachesize,
     valuecachesize            => $valuecachesize,
     nodenoevents              => $nodenoevents,
     nodenohistory             => $nodenohistory,

spec/classes/server_spec.rb

@@ -331,6 +331,7 @@
             tlscrlfile: '/etc/zabbix/keys/zabbix-server.crl',
             tlscertfile: '/etc/zabbix/keys/zabbix-server.crt',
             tlskeyfile: '/etc/zabbix/keys/zabbix-server.key',
+            historyindexcachesize: '4M',
             zabbix_version: '3.0'
           }
         end
@@ -341,6 +342,7 @@
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TLSKeyFile=/etc/zabbix/keys/zabbix-server.key$} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^SSLCertLocation=/usr/lib/zabbix/ssl/certs} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^SSLKeyLocation=/usr/lib/zabbix/ssl/keys} }
+        it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^HistoryIndexCacheSize=4M} }
       end
       context 'with zabbix_server.conf and version 3.2' do
         let :params do
@@ -349,6 +351,7 @@
             tlscrlfile: '/etc/zabbix/keys/zabbix-server.crl',
             tlscertfile: '/etc/zabbix/keys/zabbix-server.crt',
             tlskeyfile: '/etc/zabbix/keys/zabbix-server.key',
+            historyindexcachesize: '4M',
             zabbix_version: '3.2'
           }
         end
@@ -357,6 +360,7 @@
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TLSCRLFile=/etc/zabbix/keys/zabbix-server.crl$} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TLSCertFile=/etc/zabbix/keys/zabbix-server.crt$} }
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TLSKeyFile=/etc/zabbix/keys/zabbix-server.key$} }
+        it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^HistoryIndexCacheSize=4M} }
       end
     end
   end

types/historyics.pp

@@ -0,0 +1 @@
+type Zabbix::Historyics = Optional[Pattern[/^\d+[k|K|m|M]?$/]]