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 logtype parameter for zabbix server (issue #394) #650

Merged
merged 1 commit into from
Jan 30, 2020

Conversation

dpavlotzky
Copy link
Contributor

Pull Request (PR) description

This Pull Request (PR) fixes the following issues

@dpavlotzky dpavlotzky changed the title Add logtype parameter (issue #394) Add logtype parameter for zabbix server (issue #394) Jan 15, 2020
manifests/server.pp Outdated Show resolved Hide resolved
@bastelfreak bastelfreak added enhancement New feature or request needs-work not ready to merge just yet labels Jan 15, 2020
@bastelfreak
Copy link
Member

Hi @dpavlotzky, thanks for the PR. Can you please take a look at the used email address? It isn't associated with your github account.

Is the log setup only specific for the server, or also for the agent? If so, the agent code would need to be updated as well.

@dpavlotzky
Copy link
Contributor Author

@bastelfreak I have updated the email address of my Github account. The agent already has the logtype parameter:

# provided by camp2camp/systemd
if $facts['systemd'] {
$agent_logtype = 'system'
$agent_logfile = undef
$agent_logfilesize = undef
} else {
$agent_logtype = 'file'
$agent_logfile = '/var/log/zabbix/zabbix_agentd.log'
$agent_logfilesize = '100'
}

String $logtype = $zabbix::params::agent_logtype,

@dpavlotzky
Copy link
Contributor Author

The test build fails because a trailing comma is missing:

$ bundle exec rake $CHECK
manifests/server.pp:316:trailing_comma:WARNING:missing trailing comma after last element
The command "bundle exec rake $CHECK" exited with 1.

The complaint is about the following code:

https://github.com/dpavlotzky/puppet-zabbix/blob/afb8643095fca155d8e4df43af2ae9e935e60b35/manifests/server.pp#L313-L317

But the complaint is incorrect: adding a trailing comma here is a syntax error.

I will inline the Enum, but that is less pretty IMHO. Maybe someone can have a look at the test code to make it more robust.

@bastelfreak bastelfreak removed the needs-work not ready to merge just yet label Jan 30, 2020
@bastelfreak bastelfreak merged commit 50a9c4c into voxpupuli:master Jan 30, 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