Merge branch 'master' into physical_backup_restore

frappe · Jan 22, 2025 · bffc3a9 · bffc3a9
2 parents dafa1ca + d7a2d72
commit bffc3a9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/press/playbooks/roles/filebeat/templates/filebeat.yml b/press/playbooks/roles/filebeat/templates/filebeat.yml
@@ -38,6 +38,12 @@ output.elasticsearch:
   ssl.verification_mode: strict
   ssl.supported_protocols: [TLSv1.3]
 
+  {% if server_type is defined and server_type == "Database Server" %}
+
+  bulk_max_size: 10
+
+  {% endif %}
+
 # ================================== Logging ===================================
 
 logging.to_files: true

diff --git a/press/press/doctype/database_server/database_server.py b/press/press/doctype/database_server/database_server.py
@@ -354,6 +354,7 @@ def _setup_server(self):
 				user=self.ssh_user or "root",
 				port=self.ssh_port or 22,
 				variables={
+					"server_type": self.doctype,
 					"server": self.name,
 					"workers": "2",
 					"agent_password": config.agent_password,
@@ -833,6 +834,7 @@ def _rename_server(self):
 				playbook="database_rename.yml",
 				server=self,
 				variables={
+					"server_type": self.doctype,
 					"server": self.name,
 					"workers": "2",
 					"agent_password": agent_password,

diff --git a/press/press/doctype/server/server.py b/press/press/doctype/server/server.py
@@ -398,6 +398,7 @@ def _install_filebeat(self):
 				user=self._ssh_user(),
 				port=self._ssh_port(),
 				variables={
+					"server_type": self.doctype,
 					"server": self.name,
 					"log_server": log_server,
 					"kibana_password": kibana_password,

diff --git a/press/press/doctype/virtual_machine/virtual_machine.py b/press/press/doctype/virtual_machine/virtual_machine.py
@@ -339,6 +339,7 @@ def get_cloud_init(self):
 			"filebeat_config": frappe.render_template(
 				"press/playbooks/roles/filebeat/templates/filebeat.yml",
 				{
+					"server_type": server.doctype,
 					"server": self.name,
 					"log_server": log_server,
 					"kibana_password": kibana_password,