Skip to content

Commit

Permalink
roles/single: [breaking change] rename to vmsingle
Browse files Browse the repository at this point in the history
This is needed in order to avoid confusion between VictoriaMetrics and VictoriaLogs single node deployments.

Signed-off-by: Zakhar Bessarab <[email protected]>
  • Loading branch information
zekker6 committed Dec 19, 2024
1 parent 4429d46 commit 32c92f7
Show file tree
Hide file tree
Showing 29 changed files with 23 additions and 23 deletions.
24 changes: 12 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ lint:
yamllint roles playbooks; \
ansible-lint roles/ playbooks/

molecule-converge-single:
molecule-converge-vmsingle:
. .venv/bin/activate; \
cd roles/single && molecule converge -s docker
cd roles/vmsingle && molecule converge -s docker

molecule-converge-vmagent:
. .venv/bin/activate; \
Expand All @@ -37,9 +37,9 @@ molecule-converge-vmauth:
. .venv/bin/activate; \
cd roles/vmauth && molecule converge

molecule-converge-single-enterprise:
molecule-converge-vmsingle-enterprise:
. .venv/bin/activate; \
cd roles/single && molecule converge -s docker-enterprise
cd roles/vmsingle && molecule converge -s docker-enterprise

molecule-converge-vmagent-enterprise:
. .venv/bin/activate; \
Expand Down Expand Up @@ -73,15 +73,15 @@ molecule-converge-cluster-integration-enterprise:
. .venv/bin/activate; \
cd playbooks/ && molecule converge -s cluster-enterprise

molecule-converge: molecule-converge-single molecule-converge-vmagent molecule-converge-vmalert molecule-converge-vminsert molecule-converge-vmstorage molecule-converge-vmselect molecule-converge-vmauth
molecule-converge: molecule-converge-vmsingle molecule-converge-vmagent molecule-converge-vmalert molecule-converge-vminsert molecule-converge-vmstorage molecule-converge-vmselect molecule-converge-vmauth

molecule-converge-enterprise: molecule-converge-single-enterprise molecule-converge-vmagent-enterprise molecule-converge-vmalert-enterprise molecule-converge-vminsert-enterprise molecule-converge-vmstorage-enterprise molecule-converge-vmselect-enterprise molecule-converge-vmauth-enterprise
molecule-converge-enterprise: molecule-converge-vmsingle-enterprise molecule-converge-vmagent-enterprise molecule-converge-vmalert-enterprise molecule-converge-vminsert-enterprise molecule-converge-vmstorage-enterprise molecule-converge-vmselect-enterprise molecule-converge-vmauth-enterprise

molecule-converge-integration: molecule-converge-cluster-integration molecule-converge-cluster-integration-enterprise

molecule-destroy-single:
molecule-destroy-vmsingle:
. .venv/bin/activate; \
cd roles/single && molecule destroy -s docker
cd roles/vmsingle && molecule destroy -s docker

molecule-destroy-vmagent:
. .venv/bin/activate; \
Expand All @@ -107,9 +107,9 @@ molecule-destroy-vmauth:
. .venv/bin/activate; \
cd roles/vmauth && molecule destroy

molecule-destroy-single-enterprise:
molecule-destroy-vmsingle-enterprise:
. .venv/bin/activate; \
cd roles/single && molecule destroy -s docker-enterprise
cd roles/vmsingle && molecule destroy -s docker-enterprise

molecule-destroy-vmagent-enterprise:
. .venv/bin/activate; \
Expand Down Expand Up @@ -143,8 +143,8 @@ molecule-destroy-cluster-integration-enterprise:
. .venv/bin/activate; \
cd playbooks/ && molecule destroy -s cluster-enterprise

molecule-destroy: molecule-destroy-single molecule-destroy-vmagent molecule-destroy-vmalert molecule-destroy-vminsert molecule-destroy-vmstorage molecule-destroy-vmselect molecule-destroy-vmauth molecule-destroy-cluster-integration
molecule-destroy: molecule-destroy-vmsingle molecule-destroy-vmagent molecule-destroy-vmalert molecule-destroy-vminsert molecule-destroy-vmstorage molecule-destroy-vmselect molecule-destroy-vmauth molecule-destroy-cluster-integration

molecule-destroy-enterprise: molecule-destroy-single-enterprise molecule-destroy-vmagent-enterprise molecule-destroy-vmalert-enterprise molecule-destroy-vminsert-enterprise molecule-destroy-vmstorage-enterprise molecule-destroy-vmselect-enterprise molecule-destroy-vmauth-enterprise molecule-destroy-cluster-integration
molecule-destroy-enterprise: molecule-destroy-vmsingle-enterprise molecule-destroy-vmagent-enterprise molecule-destroy-vmalert-enterprise molecule-destroy-vminsert-enterprise molecule-destroy-vmstorage-enterprise molecule-destroy-vmselect-enterprise molecule-destroy-vmauth-enterprise molecule-destroy-cluster-integration

molecule-destroy-integration: molecule-destroy-cluster-integration molecule-destroy-cluster-integration-enterprise
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ ansible-galaxy collection install victoriametrics.cluster

Collection includes the following roles:

- [single](./roles/single) - installs and configures VictoriaMetrics single node
- [vmsingle](./roles/vmsingle) - installs and configures VictoriaMetrics single node
- [vmagent](./roles/vmagent) - installs and configures [`vmagent`](https://docs.victoriametrics.com/vmagent/)
- [vmalert](./roles/vmalert) - installs and configures [`vmalert`](https://docs.victoriametrics.com/vmalert/)
- [vmselect](./roles/vmselect) - installs and configures [`vmselect`](https://docs.victoriametrics.com/cluster-victoriametrics/)
- [vmstorage](./roles/vmstorage) - installs and configures [`vmstorage`](https://docs.victoriametrics.com/cluster-victoriametrics/)
- [vminsert](./roles/vminsert) - installs and configures [`vminsert`](https://docs.victoriametrics.com/cluster-victoriametrics/)
- [vmauth](./roles/vmauth) - installs and configures [`vmauth`](https://docs.victoriametrics.com/vmauth/)

See [cluster](playbooks/cluster.yml) and [single](playbooks/single.yml) playbooks for examples of how to use these
See [cluster](playbooks/cluster.yml) and [vmsingle](playbooks/vmsingle.yml) playbooks for examples of how to use these
roles.

## Cluster deployment
Expand Down
2 changes: 1 addition & 1 deletion playbooks/single.yml → playbooks/vmsingle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
become: true
hosts: all
roles:
- single
- vmsingle
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion roles/single/README.md → roles/vmsingle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ See full list at [defaults.yml](./defaults/main.yml)
| victoriametrics_backup_access_key | S3 access key. | `` |
| victoriametrics_backup_secret_key | S3 secret key. | `` |
| victoriametrics_backup_custom_s3_endpoint | Custom S3 endpoint(useful for S3-compatible services). | `` |
| victoriametrics_service_args | Passes options defined above to single. | see [defaults.yml](./defaults/main.yml) |
| victoriametrics_service_args | Passes options defined above to VictoriaMetrics single. | see [defaults.yml](./defaults/main.yml) |
| victoriametrics_service_envflag_enabled | Enable usage of environment variables for configuration. Read more: [docs](https://docs.victoriametrics.com/#environment-variables) | `false` |
| victoriametrics_service_envflag_data | Flags data to pass to service | see [defaults.yml](./defaults/main.yml) |
| victoriametrics_service_envflag_file | Location of env file to include for service. | see [defaults.yml](./defaults/main.yml) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
update_cache: yes
cache_valid_time: 3600

- name: "Include single"
- name: "Include vmsingle"
ansible.builtin.include_role:
name: "single"
name: "vmsingle"
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
victoriametrics_service_args:
storageDataPath: "{{ victoriametrics_data_dir }}"
tasks:
- name: "Include single"
- name: "Include vmsingle"
ansible.builtin.include_role:
name: "single"
name: "vmsingle"
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
victoriametrics_service_args:
storageDataPath: "{{ victoriametrics_data_dir }}"
tasks:
- name: "Include single"
- name: "Include vmsingle"
ansible.builtin.include_role:
name: "single"
name: "vmsingle"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
hosts: all
become: true
roles:
- "single"
- "vmsingle"
File renamed without changes.

0 comments on commit 32c92f7

Please sign in to comment.