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.

Sign up for GitHub

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

Jump to bottom

Bootstrap agent2 support (rebased) #914

Closed
wants to merge 1 commit into from
Closed

Bootstrap agent2 support (rebased) #914

wants to merge 1 commit into from

Conversation

Phil-Friderici
Copy link

In this PR I try to continue the work of fe80 (and others) in PR824.

Pull Request (PR) description

This Pr bootstrap a support for zabbix-agent2

  • Add param binary_location for specify zabbix agent binary (only for systemd)
  • Remove some parameters in zabbix agent configuration if it's zabbix agent2 package
    • LogRemoteCommands
    • StartAgents
    • MaxLinesPerSecond
    • AllowRoot
    • User
    • LoadModulePath

It's possible to use agent2 with this configration:

      'agent_configfile_path' => '/etc/zabbix/zabbix_agent2.conf',
      'include_dir'           => '/etc/zabbix/zabbix_agent2.d',
      'pidfile'               => '/var/run/zabbix/zabbix_agentd2.pid',
      'servicename'           => 'zabbix-agent2',
      'zabbix_package_agent'  => 'zabbix-agent2',
      'binary_location'       => '/usr/sbin/zabbix_agent2',

I actually not test with windows kernel.

This Pull Request (PR) fixes the following issues

Fixes #692

@fe80
Bootstrap agent2 support
2f9c5f9 
* Add param binary_location for specify zabbix agent binary (only for
  systemd)
* Remove some parameters in zabbix agent configuration if it's zabbix
  agent2 package
    * LogRemoteCommands
    * StartAgents
    * MaxLinesPerSecond
    * AllowRoot
    * User
    * LoadModulePath
* Fix EnableRemoteCommands still use on zabbix agentd > 5 but remove on
  agent2

Conflicts:
	manifests/agent.pp
	spec/classes/agent_spec.rb
	templates/zabbix_agentd.conf.erb
@Phil-Friderici Phil-Friderici changed the title Bootstrap agent2 support (continued) Bootstrap agent2 support (rebased) Nov 13, 2023
@Phil-Friderici Phil-Friderici mentioned this pull request Nov 13, 2023
Closed
@Clebam
Copy link

Clebam commented Dec 19, 2023

Hi @Phil-Friderici,

just to let you know that to handle windows installation from msi I needed to add this to the $agent2 boolean
$agent2 = $zabbix_package_agent in ['zabbix-agent2', 'Zabbix Agent 2 (64-bit)']

You could also make it available in the params maybe

Thanks

@Valantin
Copy link
Contributor

what is missing to merge it?

@Valantin
Copy link
Contributor

Valantin commented Mar 4, 2024

@Phil-Friderici can you rebase the PR? a fix for new acceptance was merged

@Valantin Valantin mentioned this pull request Mar 5, 2024
Merged
@Phil-Friderici
Copy link
Author

@Valantin Thanks for rebasing the PR. You were faster than me ;)
Hope this time it will get merged.

Closing this PR in favour of #929

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add Support for Zabbix Agent 2
4 participants
@Phil-Friderici @Clebam @Valantin @fe80