From c4f7f803e4fe233406d659b79589de14283bdc03 Mon Sep 17 00:00:00 2001
From: Gorka Benguria <gorka.benguria@tecnalia.com>
Date: Fri, 10 Feb 2023 09:28:51 +0100
Subject: [PATCH] new structure based on submodules
---
.gitmodules | 6 ++++
config.yaml | 4 +--
performance_monitoring | 1 +
piacere_monitoring/ansible.cfg | 5 ----
piacere_monitoring/config.yaml | 9 ------
piacere_monitoring/inventory.j2 | 9 ------
piacere_monitoring/main.yml | 30 -------------------
piacere_monitoring/site_requirements.yaml | 9 ------
piacere_monitoring/ssh_key.j2 | 1 -
piacere_monitoring/vars/main.yaml | 27 -----------------
piacere_monitoring_requirements/ansible.cfg | 5 ----
.../ansible_requirements.yml | 8 -----
piacere_monitoring_requirements/config.yaml | 6 ----
piacere_monitoring_requirements/inventory.j2 | 1 -
piacere_monitoring_requirements/main.yml | 11 -------
piacere_monitoring_requirements/ssh_key.j2 | 0
security_monitoring | 1 +
17 files changed, 10 insertions(+), 123 deletions(-)
create mode 100644 .gitmodules
create mode 160000 performance_monitoring
delete mode 100644 piacere_monitoring/ansible.cfg
delete mode 100644 piacere_monitoring/config.yaml
delete mode 100644 piacere_monitoring/inventory.j2
delete mode 100644 piacere_monitoring/main.yml
delete mode 100644 piacere_monitoring/site_requirements.yaml
delete mode 100644 piacere_monitoring/ssh_key.j2
delete mode 100644 piacere_monitoring/vars/main.yaml
delete mode 100644 piacere_monitoring_requirements/ansible.cfg
delete mode 100644 piacere_monitoring_requirements/ansible_requirements.yml
delete mode 100644 piacere_monitoring_requirements/config.yaml
delete mode 100644 piacere_monitoring_requirements/inventory.j2
delete mode 100644 piacere_monitoring_requirements/main.yml
delete mode 100644 piacere_monitoring_requirements/ssh_key.j2
create mode 160000 security_monitoring
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1e3bb1f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "security_monitoring"]
+ path = security_monitoring
+ url = ../../agents/sma-playbook.git
+[submodule "performance_monitoring"]
+ path = performance_monitoring
+ url = ../../agents/pma-playbook.git
diff --git a/config.yaml b/config.yaml
index 83fbfa3..c1ab35f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,7 +1,7 @@
---
iac:
- terraform
-- piacere_monitoring_requirements
-- piacere_monitoring
+- performance_monitoring
+- security_monitoring
- nginx
...
\ No newline at end of file
diff --git a/performance_monitoring b/performance_monitoring
new file mode 160000
index 0000000..76fb350
--- /dev/null
+++ b/performance_monitoring
@@ -0,0 +1 @@
+Subproject commit 76fb3507d97846509eafa3a3bcdbdf0d787dec41
diff --git a/piacere_monitoring/ansible.cfg b/piacere_monitoring/ansible.cfg
deleted file mode 100644
index 885456a..0000000
--- a/piacere_monitoring/ansible.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
-[defaults]
-host_key_checking = False
-deprecation_warnings=False ; to remove the python version depretation warning
-display_skipped_hosts = no
\ No newline at end of file
diff --git a/piacere_monitoring/config.yaml b/piacere_monitoring/config.yaml
deleted file mode 100644
index a62bdc6..0000000
--- a/piacere_monitoring/config.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-
----
-input:
- - instance_ip_vm1
- - instance_server_private_key_user1
- - DEPLOYMENT_ID
-output: []
-engine: ansible
-...
diff --git a/piacere_monitoring/inventory.j2 b/piacere_monitoring/inventory.j2
deleted file mode 100644
index fda17b3..0000000
--- a/piacere_monitoring/inventory.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-[servers_for_piacere_monitoring]
-{{ instance_ip_vm1 }}
-
-[servers_for_piacere_monitoring:vars]
-ansible_connection=ssh
-ansible_user=ubuntu
-ansible_ssh_private_key_file=ssh_key
diff --git a/piacere_monitoring/main.yml b/piacere_monitoring/main.yml
deleted file mode 100644
index 9e047c5..0000000
--- a/piacere_monitoring/main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-- hosts: all
- pre_tasks:
- - name: Check parameters
- fail:
- msg: 'variable {{item}} empty'
- when: item | length == 0
- with_items:
- - "{{ pma_deployment_id }}"
- - "{{ pma_influxdb_bucket }}"
- - "{{ pma_influxdb_token }}"
- - "{{ pma_influxdb_org }}"
- - "{{ pma_influxdb_addr }}"
- - name: Print parameters
- debug:
- msg:
- - "pma_deployment_id: {{ pma_deployment_id }}"
- - "pma_influxdb_bucket: {{ pma_influxdb_bucket }}"
- - "pma_influxdb_token: {{ pma_influxdb_token }}"
- - "pma_influxdb_org: {{ pma_influxdb_org }}"
- - "pma_influxdb_addr: {{ pma_influxdb_addr | length }}"
- - name: Ensure gnupg package
- package:
- name: gnupg
- state: present
- become: true
-
- vars_files:
- - vars/main.yaml
- roles:
- - dj-wasabi.telegraf
diff --git a/piacere_monitoring/site_requirements.yaml b/piacere_monitoring/site_requirements.yaml
deleted file mode 100644
index 3e7665d..0000000
--- a/piacere_monitoring/site_requirements.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: localhost
- tasks:
- - name: print disclamer
- debug:
- msg: this can also be done with "ansible-galaxy install -r requirements"
- - name: install telegraf from galaxy
- community.general.ansible_galaxy_install:
- type: role
- requirements_file: ansible_requirements.yml
diff --git a/piacere_monitoring/ssh_key.j2 b/piacere_monitoring/ssh_key.j2
deleted file mode 100644
index 1431f67..0000000
--- a/piacere_monitoring/ssh_key.j2
+++ /dev/null
@@ -1 +0,0 @@
-{{ instance_server_private_key_user1 }}
diff --git a/piacere_monitoring/vars/main.yaml b/piacere_monitoring/vars/main.yaml
deleted file mode 100644
index 82a1377..0000000
--- a/piacere_monitoring/vars/main.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-pma_deployment_id: "{{ lookup('env', 'DEPLOYMENT_ID' ) }}"
-pma_influxdb_bucket: "{{ lookup('env', 'INFLUXDB_BUCKET' ) }}"
-pma_influxdb_token: "{{ lookup('env', 'INFLUXDB_TOKEN' ) }}"
-pma_influxdb_org: "{{ lookup('env', 'INFLUXDB_ORG' ) }}"
-pma_influxdb_addr: "{{ lookup('env', 'INFLUXDB_ADDR' ) }}"
-
-telegraf_agent_package_state: latest
-
-telegraf_agent_output:
- - type: influxdb_v2
- config:
- - urls = ["{{ pma_influxdb_addr }}"]
- - token = "{{ pma_influxdb_token }}"
- - organization = "{{ pma_influxdb_org }}"
- - bucket = "{{ pma_influxdb_bucket }}"
- - insecure_skip_verify = true
-
-telegraf_global_tags:
- - tag_name: deployment_id
- tag_value: "{{ pma_deployment_id }}"
-
-telegraf_plugins_default:
- - plugin: cpu
- - plugin: mem
- - plugin: processes
- - plugin: disk
- - plugin: net
\ No newline at end of file
diff --git a/piacere_monitoring_requirements/ansible.cfg b/piacere_monitoring_requirements/ansible.cfg
deleted file mode 100644
index 885456a..0000000
--- a/piacere_monitoring_requirements/ansible.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
-[defaults]
-host_key_checking = False
-deprecation_warnings=False ; to remove the python version depretation warning
-display_skipped_hosts = no
\ No newline at end of file
diff --git a/piacere_monitoring_requirements/ansible_requirements.yml b/piacere_monitoring_requirements/ansible_requirements.yml
deleted file mode 100644
index 58c0cb3..0000000
--- a/piacere_monitoring_requirements/ansible_requirements.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-roles:
-# - name: dj-wasabi.telegraf
-# version: 0.13.2
-# source: https://galaxy.ansible.com
- - name: dj-wasabi.telegraf
- src: https://github.com/dj-wasabi/ansible-telegraf.git
- scm: git
- version: 0.13.2
diff --git a/piacere_monitoring_requirements/config.yaml b/piacere_monitoring_requirements/config.yaml
deleted file mode 100644
index 8ddae8c..0000000
--- a/piacere_monitoring_requirements/config.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-
----
-input: []
-output: []
-engine: ansible
-...
diff --git a/piacere_monitoring_requirements/inventory.j2 b/piacere_monitoring_requirements/inventory.j2
deleted file mode 100644
index 05614f6..0000000
--- a/piacere_monitoring_requirements/inventory.j2
+++ /dev/null
@@ -1 +0,0 @@
-localhost ansible_connection=local
\ No newline at end of file
diff --git a/piacere_monitoring_requirements/main.yml b/piacere_monitoring_requirements/main.yml
deleted file mode 100644
index 734e9e9..0000000
--- a/piacere_monitoring_requirements/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- name: "Intalling requirements"
- hosts: localhost
- connection: local
- tasks:
- - name: print disclamer
- debug:
- msg: this can also be done with "ansible-galaxy install -r requirements"
- - name: install telegraf from galaxy
- community.general.ansible_galaxy_install:
- type: role
- requirements_file: ansible_requirements.yml
diff --git a/piacere_monitoring_requirements/ssh_key.j2 b/piacere_monitoring_requirements/ssh_key.j2
deleted file mode 100644
index e69de29..0000000
diff --git a/security_monitoring b/security_monitoring
new file mode 160000
index 0000000..b7b7758
--- /dev/null
+++ b/security_monitoring
@@ -0,0 +1 @@
+Subproject commit b7b77584b5b22de27d6b5c59a71f67c7023f5099
--
GitLab