Showing
4 changed files
with
26 additions
and
8 deletions
1 | +## 0.1.4 - 2016-12-22 | |
2 | +### Changed | |
3 | +- Attribute node['cookbook-zabbix']['agent']['server_ip'] should now be in a secret data bag item named 'cfe-server-secret'. | |
4 | +### Added | |
5 | +- Updated README. | |
6 | + | |
1 | 7 | ## 0.1.3 - 2016-12-22 |
2 | 8 | ### Added |
3 | 9 | - Forgot to add 'cookbook-zabbix::agent_package' as part of the run chain. | ... | ... |
... | ... | @@ -99,18 +99,26 @@ Tested on Ubuntu 14.04. |
99 | 99 | <td>Whether or not to include the recipe 'cfe-nginx-php-fpm::nginx'.</td> |
100 | 100 | <td><tt>true</tt></td> |
101 | 101 | </tr> |
102 | + <tr> | |
103 | + <td><tt>['cfe-server']['monitor']['include_zabbix_agent']</tt></td> | |
104 | + <td>Boolean</td> | |
105 | + <td>Whether or not to include the recipe 'cookbook-zabbix::agent_package'.</td> | |
106 | + <td><tt>true</tt></td> | |
107 | + </tr> | |
102 | 108 | </table> |
103 | 109 | |
104 | 110 | ## Usage |
105 | 111 | |
106 | 112 | ### Secret Data Bag |
107 | 113 | |
108 | -A secret data bag named either `prod`, `staging`, or `dev` has to be created. In it should be an item named `cfe-server-secret` that contains two properties: `iptables_ssh_ports` and `iptables_add_rules`. | |
114 | +A secret data bag named either `prod`, `staging`, or `dev` has to be created. In it should be an item named `cfe-server-secret` that contains the following properties: | |
109 | 115 | |
110 | 116 | `iptables_ssh_ports` is an array that contains ports to be used by sshd. |
111 | 117 | |
112 | 118 | `iptables_add_rules` is an array of hashes that denote additional FILTER iptables rules to be created on the server. The hashes must conform to the format required by the cookbook `cfe-simple-iptables`. |
113 | 119 | |
120 | +`ip_zabbix` is the IP addres of the Zabbix Monitoring Server. | |
121 | + | |
114 | 122 | Example: |
115 | 123 | ```json |
116 | 124 | { |
... | ... | @@ -122,7 +130,8 @@ Example: |
122 | 130 | "rule" : "--proto tcp --dport 8080", |
123 | 131 | "weight": 25 |
124 | 132 | } |
125 | - ] | |
133 | + ], | |
134 | + "ip_zabbix": "1.2.3.4" | |
126 | 135 | } |
127 | 136 | ``` |
128 | 137 | ... | ... |
... | ... | @@ -20,11 +20,12 @@ |
20 | 20 | |
21 | 21 | cb = 'cfe-server' |
22 | 22 | |
23 | -# Secret data bag stuff | |
24 | -# | |
25 | -# Necessary secret data bag key/s: | |
26 | -# iptables_ssh_ports | |
27 | -# iptables_add_rules | |
23 | +## Secret data bag stuff | |
24 | +## | |
25 | +## Necessary secret data bag key/s: | |
26 | +## iptables_ssh_ports | |
27 | +## iptables_add_rules | |
28 | +## ip_zabbix | |
28 | 29 | |
29 | 30 | databag = |
30 | 31 | case node.chef_environment |
... | ... | @@ -157,3 +158,5 @@ rules_filter2 = [ |
157 | 158 | |
158 | 159 | default['cfe-simple-iptables']['filter'] = |
159 | 160 | rules_filter1 + rules_add + rules_filter2 |
161 | + | |
162 | +default['cookbook-zabbix']['agent']['server_ip'] = secret['ip_zabbix'] | ... | ... |
... | ... | @@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com' |
4 | 4 | license 'Apache License' |
5 | 5 | description 'Simplifies setting up common Linux servers.' |
6 | 6 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) |
7 | -version '0.1.3' | |
7 | +version '0.1.4' | |
8 | 8 | |
9 | 9 | %w{ |
10 | 10 | cfe-users cfe-mariadb | ... | ... |