Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for defining host's macros #671

Merged
merged 6 commits into from
Apr 14, 2020
Merged

Conversation

zv0n
Copy link
Contributor

@zv0n zv0n commented Apr 8, 2020

Pull Request (PR) description

This commit adds support for defining custom macros for zabbix hosts

@vox-pupuli-tasks
Copy link

Dear @zv0n, thanks for the PR!

This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase?

You can find my sourcecode at voxpupuli/vox-pupuli-tasks

1 similar comment
@vox-pupuli-tasks
Copy link

Dear @zv0n, thanks for the PR!

This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase?

You can find my sourcecode at voxpupuli/vox-pupuli-tasks

manifests/agent.pp Outdated Show resolved Hide resolved
@bastelfreak bastelfreak added enhancement New feature or request needs-rebase needs-work not ready to merge just yet labels Apr 14, 2020
@bastelfreak
Copy link
Member

thanks for the work @zv0n. can you please rebase?

@zv0n
Copy link
Contributor Author

zv0n commented Apr 14, 2020

Hi,
I've rebased and added the datatype

@zv0n zv0n requested a review from bastelfreak April 14, 2020 13:00
@bastelfreak
Copy link
Member

@zv0n can you please fix the failing travis job?

@zv0n
Copy link
Contributor Author

zv0n commented Apr 14, 2020

Hi,
I've fixed the job

@bastelfreak bastelfreak removed needs-rebase needs-work not ready to merge just yet labels Apr 14, 2020
@@ -249,6 +252,7 @@
Variant[String[1],Array[String[1]]] $zbx_groups = $zabbix::params::agent_zbx_groups,
$zbx_group_create = $zabbix::params::agent_zbx_group_create,
$zbx_templates = $zabbix::params::agent_zbx_templates,
Optional[Array[Hash]] $zbx_macros = $zabbix::params::agent_zbx_macros,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for arrays we try to use [] as default, or {} for hashes. In that case we won't need the Optional part. I think that would be possible here was well?

We've more of our review guidelines available at https://voxpupuli.org/docs/reviewing_pr/

@@ -249,6 +252,7 @@
Variant[String[1],Array[String[1]]] $zbx_groups = $zabbix::params::agent_zbx_groups,
$zbx_group_create = $zabbix::params::agent_zbx_group_create,
$zbx_templates = $zabbix::params::agent_zbx_templates,
Array[Hash] $zbx_macros = $zabbix::params::agent_zbx_macros,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Array[Hash] $zbx_macros = $zabbix::params::agent_zbx_macros,
Array[Hash] $zbx_macros = [],

@@ -317,6 +317,7 @@
$agent_zbx_templates = [
'Template OS Linux',
'Template App SSH Service']
$agent_zbx_macros = undef
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove this line

@zv0n
Copy link
Contributor Author

zv0n commented Apr 14, 2020

Looks like the job failed because there was a problem problem when connecting to the container, should I do something or is the pull request ok now?

@zv0n zv0n requested a review from bastelfreak April 14, 2020 18:44
@bastelfreak
Copy link
Member

I restarted the job

@bastelfreak bastelfreak merged commit 87e09e3 into voxpupuli:master Apr 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants