search

saltstack-formulas / zabbix-formula

http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html
Other
50 stars 121 forks source link

Fixed variable name in pillar.example #118

Closed filicivi closed 5 years ago

aboe76 commented 5 years ago

@filicivi what about these lines? https://github.com/saltstack-formulas/zabbix-formula/blob/d802a0239f07ae4a29ff2b05c13daec1f39065f2/zabbix/mysql/conf.sls#L6

filicivi commented 5 years ago

@aboe76 Maybe i'm wrong but those lines seems not working. I've tried to use 'dbpass' as specified in pillar.example but my zabbix_server.conf has been templated using the default password 'zabbix' as specified in map.jinja.

aboe76 commented 5 years ago

@filicivi Ok, I get it now, You want to take a look at this part of the formula: https://github.com/saltstack-formulas/zabbix-formula/blob/d802a0239f07ae4a29ff2b05c13daec1f39065f2/zabbix/files/default/etc/zabbix/zabbix_server.conf.jinja#L144

If I'm reading this correctly, the DBPassword is the password set in the database part, but the mysql part of the formula uses dbpass in pillar zabbix-mysql.

I think there was a change in the pillar keys, switching from dbpass to dbpassword but they left the zabbix config out of it.

@hatifnatt can you confirm this?

hatifnatt commented 5 years ago

Yes, I think this is correct fix. dbpass was renamed to dbpassword in #86 (discussed in #83 but no feedback is given) and I forget to fix pillar.example for zabbix-server part https://github.com/saltstack-formulas/zabbix-formula/blob/c3c2f8c334237f469e2f540855fa784c10e6ca71/pillar.example#L51 while zabbix-mysql was updated correctly https://github.com/saltstack-formulas/zabbix-formula/blob/c3c2f8c334237f469e2f540855fa784c10e6ca71/pillar.example#L59

aboe76 commented 5 years ago

@filicivi thanks for your contribution,

@hatifnatt thanks for your time, if you can help me clean up this formula, by reviewing the PR's and stating which can be merged in which order, then I will do my best to merge the PR's swiftly.