- fix provisioners - move inline to scripts - fix scripts

README.md

@@ -11,8 +11,10 @@
   * в файле vars.tf (переименовать с example) указать кол-ко витруальных машин (если нужно как-то по другому) и регион (если нужен другой)
 
 ### Что запустить:
-  * на иснтансе с сервером в домашней папке запускаем скрипт установки
+  * на инстансе с сервером в домашней папке запускаем скрипт установки
     - setupzabbix.sh
+  * на инстансе с агентом в домашней папке запускаем скрипт
+    - setupagent.sh
 
 ### Что получаем на выходе
   1. установленный и готовый к работе zabbix-server и сколько-то машин с агентами для тестирования

instances.tf

@@ -7,20 +7,18 @@ resource "google_compute_instance" "agent" {
   zone         = "${var.zone_instance}"
   tags         = ["${var.zabbix_tag}"]
 
-  # add image disk
   boot_disk {
     initialize_params {
       image = var.disk_image
     }
   }
 
-  # add network
   network_interface {
     network = "default"
     access_config {
     }
   }
-  # ssh_key
+
   metadata = {
     sshKeys = "${var.default_user}:${file("~/.ssh/id_rsa.pub")}"
   }
@@ -32,23 +30,17 @@ resource "google_compute_instance" "agent" {
     private_key = "${file("~/.ssh/id_rsa")}"
   }
 
-  provisioner "remote-exec" {
-    inline = ["${file("scripts/setupagent.sh")}"]
-  }
-
   provisioner "file" {
     source      = "scripts/agents/zabbix_agentd.conf"
     destination = "~/zabbix_agentd.conf"
   }
 
-  provisioner "remote-exec" {
-    inline = [
-      "sudo apt update",
-      "sudo apt install nginx -y",
-      "sudo echo ${self.name} >> /var/www/html/index.nginx-debian.html",
-      "sudo systemctl enable nginx && sudo systemctl start nginx",
-      "sudo cp ~/zabbix_agentd.conf /etc/zabbix/",
-      "sudo service zabbix-agent restart"
-    ]
+  provisioner "file" {
+    source      = "scripts/setupagent.sh"
+    destination = "~/setupagent.sh"
   }
+
+  # provisioner "remote-exec" {
+  #   inline = ["${file("scripts/setupagent.sh")}"]
+  # }
 }

main.tf

@@ -7,20 +7,18 @@ resource "google_compute_instance" "zabbix" {
   zone         = "${var.zone_instance}"
   tags         = ["${var.zabbix_tag}"]
 
-  # add image disk
   boot_disk {
     initialize_params {
       image = var.disk_image
     }
   }
 
-  # add network
   network_interface {
     network = "default"
     access_config {
     }
   }
-  # ssh_key
+
   metadata = {
     sshKeys = "${var.default_user}:${file("~/.ssh/id_rsa.pub")}"
   }
@@ -36,13 +34,12 @@ resource "google_compute_instance" "zabbix" {
     destination = "~/setupzabbix.sh"
   }
 
-  # provisioner "remote-exec" {
-  #   inline = ["${file("scripts/setupzabbix.sh")}"]
-  # }
-
   provisioner "file" {
     source      = "scripts/zabconf"
     destination = "~/"
   }
 
+  # provisioner "remote-exec" {
+  #   inline = ["${file("scripts/setupzabbix.sh")}"]
+  # }
 }

scripts/setupagent.sh

@@ -6,4 +6,10 @@ sudo dpkg -i zabbix-release_4.0-2+bionic_all.deb
 sudo apt-get update
 sudo apt-get install mc htop -y
 sudo apt install zabbix-agent -y
-sudo service zabbix-agent start
+sudo cp ~/zabbix_agentd.conf /etc/zabbix/
+sudo service zabbix-agent restart
+sudo update-rc.d zabbix-agent enable
+
+sudo apt install nginx -y
+sudo systemctl enable nginx
+sudo systemctl start nginx

scripts/setupzabbix.sh

@@ -17,11 +17,11 @@ sudo mysql -uroot -e "quit"
 
 sudo zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | sudo mysql -uzabbix zabbix -pV7F4Uj12dcn5WAu
 
-git clone https://github.com/vasyakrg/zabbix-alert-scripts.git /usr/lib/zabbix/alertscripts
+sudo git clone https://github.com/vasyakrg/zabbix-alert-scripts.git /usr/lib/zabbix/alertscripts
 sudo chown -R zabbix:root /usr/lib/zabbix/alertscripts
 
-sudo cp ~/zabbix_server.conf /etc/zabbix
-sudo cp ~/apache.conf /etc/zabbix
+sudo cp ~/zabconf/zabbix_server.conf /etc/zabbix
+sudo cp ~/zabconf/apache.conf /etc/zabbix
 
 sudo service apache2 restart
 sudo service zabbix-server start