Disroot-Ansible
/
zabbix
10
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

v6 update #1

Merged
meaz merged 24 commits from v6_update into main 2023-08-07 08:13:23 +02:00
Conversation 0 Commits 24 Files Changed 20 +1227 -231
meaz commented 2023-08-01 21:50:07 +02:00
Owner
Copy Link

It updates vagrant, zabbix to v6, the different templates, etc.

Tested on vagrant and proxmox machine.

It updates vagrant, zabbix to v6, the different templates, etc. Tested on vagrant and proxmox machine.
muppeth was assigned by meaz 2023-08-01 21:50:07 +02:00
meaz added 13 commits 2023-08-01 21:50:08 +02:00
meaz added 1 commit 2023-08-01 22:46:08 +02:00
muppeth reviewed 2023-08-01 23:11:36 +02:00
defaults/main.yml
@ -8,3 +6,1 @@
zabbix_agent: 'true'
zabbix_server: 'true'
zabbix_proxy: 'false'
zabbix_version: '6.0'
muppeth commented 2023-08-01 23:11:36 +02:00
Owner
Copy Link

We should default to 6.4

We should default to 6.4
meaz commented 2023-08-01 23:17:37 +02:00
Author
Owner
Copy Link

6.0 is LTS that is why but OK, I'll change that when all other changes are approved/tested

6.0 is LTS that is why but OK, I'll change that when all other changes are approved/tested
muppeth commented 2023-08-01 23:19:21 +02:00
Owner
Copy Link

If its LTS the leave it indeed for the defaults. I thought 6.4 was.

If its LTS the leave it indeed for the defaults. I thought 6.4 was.
meaz marked this conversation as resolved
meaz added 1 commit 2023-08-01 23:14:28 +02:00
muppeth reviewed 2023-08-01 23:15:25 +02:00
templates/etc/zabbix/php-fpm.conf.j2
@ -0,0 +1,24 @@
[zabbix]
muppeth commented 2023-08-01 23:15:25 +02:00
Owner
Copy Link

If its a template it should be templatable otherwise it should be a file IMO.
It would be good to be able to at least adjust pm stuff

If its a template it should be templatable otherwise it should be a file IMO. It would be good to be able to at least adjust `pm` stuff
meaz marked this conversation as resolved
muppeth reviewed 2023-08-01 23:16:44 +02:00
templates/etc/zabbix/web/zabbix.conf.php.j2 Outdated
@ -0,0 +31,4 @@
// Uncomment and set to desired values to override Zabbix hostname/IP and port.
// $ZBX_SERVER = '{{ zabbix_server_hostname }}';
// $ZBX_SERVER_PORT = '{{ zabbix_server_listen_port }}';
muppeth commented 2023-08-01 23:16:44 +02:00
Owner
Copy Link

Why templating those two values if they are commented out?

Why templating those two values if they are commented out?
meaz commented 2023-08-01 23:25:30 +02:00
Author
Owner
Copy Link

because there were templated before, but there are commenting out because they were commenting out in upstream new version, so I wasn't sure what to do... If you think that should be uncomment, let me know.

because there were templated before, but there are commenting out because they were commenting out in upstream new version, so I wasn't sure what to do... If you think that should be uncomment, let me know.
muppeth commented 2023-08-07 05:15:37 +02:00
Owner
Copy Link

I think if we keep defaults declared then we should uncomment. Or remove it from defaults, and in that case:
Either just remove the vars in the template. or add something like:
{% if zabbix_server_hostname is defined %}

But all that is just details.

I think if we keep defaults declared then we should uncomment. Or remove it from defaults, and in that case: Either just remove the vars in the template. or add something like: `{% if zabbix_server_hostname is defined %}` But all that is just details.
meaz commented 2023-08-07 08:13:11 +02:00
Author
Owner
Copy Link

done

done
meaz added 1 commit 2023-08-01 23:22:26 +02:00
meaz added 1 commit 2023-08-02 07:56:06 +02:00
meaz added 3 commits 2023-08-03 11:29:26 +02:00
meaz added 1 commit 2023-08-04 07:46:50 +02:00
meaz added 1 commit 2023-08-04 07:58:32 +02:00
meaz added 1 commit 2023-08-04 08:17:47 +02:00
meaz added 1 commit 2023-08-07 08:13:03 +02:00
meaz merged commit 10dcfe9818 into main 2023-08-07 08:13:23 +02:00
meaz referenced this issue from a commit 2023-08-07 08:13:23 +02:00
v6 update (#1)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
muppeth
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Disroot-Ansible/zabbix#1
No description provided.
Delete Branch "v6_update"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?