Skip to content

Commit d901e0b

Browse files
cwadhwani-splunkmstopa-splunkrenovate[bot]ikheifets-splunksbylica-splunk
authored
feat: Release v3.35.0 (#2733)
* docs: Updating the vendor documentation with the correct port number (5425) for TLS framed logs. (#2664) * feat: Add a health check endpoint (#2670) * docs: Updated the dead links on create-parser page (#2665) * chore(deps): update splunk/addonfactory-test-matrix-action action to v3 (#2667) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * docs: add "Architecture and Load Balancers" (#2574) * fix: CVE (#2660) Signed-off-by: Ilya Kheifets <[email protected]> * docs: update NGINX health_check command usage * docs: update NGINX health_check command usage * fix: poetry export after 2.0 (#2678) Signed-off-by: Ilya Kheifets <[email protected]> * fix: rebuild docker image after alpine security fixes (#2687) Signed-off-by: Ilya Kheifets <[email protected]> * docs: Describe load balancing with F5 (#2677) * fix: resolve sonarqube reported issues (#2690) * Refactoring and fixing sonarqube issues * Added custom marks to pytest.ini * Excluded tests from sonarqube scan * Changed rhel version in docs (#2699) * Added support for multiple destinations in healthcheck (#2704) * docs: remove experimental status for EP (#2714) Signed-off-by: Ilya Kheifets <[email protected]> * docs: Updated the splunk add-on link in the panos documentation (#2695) * docs: Updated the splunk add-on link in the PaloaltoNetworks panos documentation * Empty commit for triggering workflow * feat: Added support for vectra json logs (#2694) * feat: Added support for vectra json logs * Empty commit for triggering workflow * chore: add netapp tests (#2705) * chore: add netapp test * chore: update netapp config * chore: fix typo * fix: vuln fix alpine (#2726) * vuln fix alpine * Updated the content-hash for the latest poetry.lock file * Updated the packages * Upgrading xz-libs to the latest version --------- Co-authored-by: cwadhwani-splunk <[email protected]> * fix: Added a couple of parsers in the enterprise version. (#2734) * fix: Added a couple of parsers in the enterprise version. (#2734) --------- Signed-off-by: Ilya Kheifets <[email protected]> Co-authored-by: mstopa-splunk <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ilya Kheifets <[email protected]> Co-authored-by: mstopa-splunk <[email protected]> Co-authored-by: sbylica-splunk <[email protected]> Co-authored-by: Szymon Bylica <[email protected]> Co-authored-by: ajasnosz <[email protected]> Co-authored-by: Rahul Jha <[email protected]>
1 parent f371f1d commit d901e0b

File tree

135 files changed

+1735
-517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+1735
-517
lines changed

‎.github/workflows/ci-main.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
semantic_version: 18
6464
extra_plugins: |
6565
@semantic-release/[email protected]
66-
6766
@semantic-release/git
6867
semantic-release-helm
6968
@google/[email protected]

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ tags
304304
# Persistent undo
305305
[._]*.un~
306306

307-
<<<<<<< HEAD
308307
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
309308
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
310309

‎ansible/Dockerfile

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# install requirements in venv
22
FROM python:3.10 AS venv_builder
3-
RUN pip install ansible~=6.1.0 --no-cache-dir
4-
RUN pip install pywinrm>=0.4.2 --no-cache-dir
5-
RUN pip install ansible-lint>=6.0.0 --no-cache-dir
3+
RUN pip install ansible~=6.1.0 --no-cache-dir \
4+
&& pip install pywinrm>=0.4.2 --no-cache-dir \
5+
&& pip install ansible-lint>=6.0.0 --no-cache-dir
66

77
WORKDIR /opt
88
COPY ./ansible .
99
COPY ./charts .
1010

11-
RUN apt-get update -y
12-
RUN apt-get install parallel -y
13-
RUN apt-get install sshpass
11+
RUN apt update -y \
12+
&& apt install --no-install-recommends -y build-essential parallel \
13+
&& apt install --no-install-recommends -y sshpass \
14+
&& apt clean
1415

1516
ENV ANSIBLE_CONFIG /opt/ansible.cfg
1617
ENV ANSIBLE_HOST_KEY_CHECKING False

‎ansible/app/docker-compose.yml

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
version: "3.7"
23
services:
34
sc4s:
@@ -7,18 +8,18 @@ services:
78
condition: on-failure
89
image: ghcr.io/splunk/splunk-connect-for-syslog/container3:latest
910
ports:
10-
- target: 514
11-
published: 514
12-
protocol: tcp
13-
- target: 514
14-
published: 514
15-
protocol: udp
16-
- target: 601
17-
published: 601
18-
protocol: tcp
19-
- target: 6514
20-
published: 6514
21-
protocol: tcp
11+
- target: 514
12+
published: 514
13+
protocol: tcp
14+
- target: 514
15+
published: 514
16+
protocol: udp
17+
- target: 601
18+
published: 601
19+
protocol: tcp
20+
- target: 6514
21+
published: 6514
22+
protocol: tcp
2223
env_file:
2324
- /opt/sc4s/env_file
2425
volumes:
@@ -30,4 +31,4 @@ services:
3031
# - /opt/sc4s/tls:/etc/syslog-ng/tls:z
3132

3233
volumes:
33-
splunk-sc4s-var:
34+
splunk-sc4s-var:

‎ansible/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
## SPDX-License-Identifier: LicenseRef-Splunk-8-2021
44
##
55
##
6+
---
67
version: "3.7"
78
services:
8-
99
ansible_sc4s:
1010
build:
1111
context: ../

‎ansible/inventory/inventory.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
---
12
all:
23
hosts:
34
children:
45
node:
56
hosts:
67
node_1:
7-
ansible_host:
8+
ansible_host:

‎ansible/inventory/inventory_microk8s.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
all:
23
hosts:
34
children:

‎ansible/inventory/inventory_microk8s_ha.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
all:
23
hosts:
34
children:

‎ansible/inventory/inventory_swarm.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
all:
23
hosts:
34
children:

‎ansible/playbooks/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- hosts: node_1
3-
become: yes
3+
become: true
44
vars:
55
iface: "{{ swarm_iface | default('eth0') }}"
66
tasks:

‎ansible/playbooks/docker_swarm.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- hosts: manager[0]
3-
become: yes
3+
become: true
44
vars:
55
iface: "{{ swarm_iface | default('eth0') }}"
66
tasks:
@@ -10,7 +10,7 @@
1010
- include_tasks: ../tasks/docker_swarm/create_swarm.yml
1111

1212
- hosts: manager, !manager[0]
13-
become: yes
13+
become: true
1414
vars:
1515
iface: "{{ swarm_iface | default('eth0') }}"
1616
tasks:
@@ -20,14 +20,14 @@
2020
- include_tasks: ../tasks/docker_swarm/join_managers.yml
2121

2222
- hosts: worker
23-
become: yes
23+
become: true
2424
tasks:
2525
- name: Docker installation role
2626
include_role:
2727
name: install_docker
2828
- include_tasks: ../tasks/docker_swarm/join_workers.yml
2929

3030
- hosts: manager[0]
31-
become: yes
31+
become: true
3232
tasks:
3333
- include_tasks: ../tasks/docker_swarm/deploy_stack.yml

‎ansible/playbooks/microk8s.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
22
- hosts: node_1
3-
become: yes
3+
become: true
44
vars:
55
microk8s_plugins:
6-
# Do not provide here metallb here as the installation process is different to standard plugins
6+
# Do not provide here metallb here as the installation process
7+
# is different to standard plugins
78
helm3: true
89
dns: true
910
community: true

‎ansible/playbooks/microk8s_ha.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
22
- hosts: manager
3-
become: yes
3+
become: true
44
vars:
55
microk8s_plugins:
6-
# Do not provide here metallb here as the installation process is different to standard plugins
6+
# Do not provide here metallb here as the installation process
7+
# is different to standard plugins
78
helm3: true
89
dns: true
910
community: true
@@ -19,10 +20,11 @@
1920
- include_tasks: ../tasks/mk8s/update_etc_hosts.yml
2021

2122
- hosts: workers
22-
become: yes
23+
become: true
2324
vars:
2425
microk8s_plugins:
25-
# Do not provide here metallb here as the installation process is different to standard plugins
26+
# Do not provide here metallb here as the installation process
27+
# is different to standard plugins
2628
helm3: true
2729
dns: true
2830
community: true

‎ansible/playbooks/podman.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- hosts: node_1
3-
become: yes
3+
become: true
44
tasks:
55
- name: Podman installation role
66
include_role:

‎ansible/roles/install_docker/tasks/install_docker_debian.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Ensure dependencies are installed
33
apt:
4-
update-cache: yes
4+
update-cache: true
55
name:
66
- ca-certificates
77
- curl

‎ansible/roles/install_docker/tasks/install_docker_rhel.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
- name: Add Docker Repository (RedHat, centOS)
1414
shell: |
1515
dnf install -y yum-utils
16-
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
16+
yum-config-manager --add-repo
17+
https://download.docker.com/linux/centos/docker-ce.repo
1718
args:
18-
warn: no
19+
warn: false
1920

2021
- name: Install docker-ce (RedHat, CentOS)
2122
yum:

‎ansible/tasks/docker/deploy_app.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
file:
44
path: "{{ item }}"
55
state: directory
6-
mode: 0755
6+
mode: 0750
77
loop:
88
- /opt/sc4s
99
- /opt/sc4s/tls
@@ -16,15 +16,15 @@
1616
dest: "/lib/systemd/system/sc4s.service"
1717
owner: "{{ ansible_user }}"
1818
group: "{{ ansible_user }}"
19-
mode: u=rw,g=rw,o=r
19+
mode: u=rw,g=rw
2020

2121
- name: Copying env_file file on the server
2222
copy:
2323
src: "/opt/ansible/resources/env_file"
2424
dest: "/opt/sc4s/env_file"
2525
owner: "{{ ansible_user }}"
2626
group: "{{ ansible_user }}"
27-
mode: u=rw,g=rw,o=r
27+
mode: u=rw,g=rw
2828

2929
- name: Create a volume
3030
docker_volume:
@@ -33,7 +33,6 @@
3333
- name: Enable sc4s service
3434
ansible.builtin.systemd:
3535
name: sc4s
36-
enabled: yes
37-
daemon_reload: yes
36+
enabled: true
37+
daemon_reload: true
3838
state: started
39-

‎ansible/tasks/docker_swarm/create_swarm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030

3131
- name: "set fact: join_token_worker"
3232
set_fact:
33-
join_token_worker: "{{ join_token_worker_command['stdout'] }}"
33+
join_token_worker: "{{ join_token_worker_command['stdout'] }}"

‎ansible/tasks/docker_swarm/deploy_stack.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
dest: "/home/{{ ansible_user }}/docker-compose.yml"
66
owner: "{{ ansible_user }}"
77
group: "{{ ansible_user }}"
8-
mode: u=rw,g=rw,o=r
8+
mode: u=rw,g=rw
99

1010
- name: Create sc4s dependency directories
1111
file:
1212
path: "{{ item }}"
1313
state: directory
14-
mode: 0755
14+
mode: 0750
1515
loop:
1616
- /opt/sc4s
1717
- /opt/sc4s/tls
@@ -24,7 +24,7 @@
2424
dest: "/opt/sc4s/env_file"
2525
owner: "{{ ansible_user }}"
2626
group: "{{ ansible_user }}"
27-
mode: u=rw,g=rw,o=r
27+
mode: u=rw,g=rw
2828

2929
- name: Create a volume
3030
docker_volume:
@@ -36,4 +36,3 @@
3636
name: SC4S
3737
compose:
3838
- "/home/{{ ansible_user }}/docker-compose.yml"
39-

‎ansible/tasks/docker_swarm/join_managers.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
- name: v2
99
add_host:
10-
hostname: "{{ groups['manager'] | map('extract', hostvars, ['ansible_host']) | join(':2377,') }}:2377"
10+
hostname: "{{ groups['manager'] |
11+
map('extract', hostvars, ['ansible_host']) | join(':2377,') }}:2377"
1112
groups: main_nodes_ips_with_port
1213
with_items: "{{ ansible_play_hosts | default(play_hosts) }}"
1314

@@ -17,4 +18,4 @@
1718
state: join
1819
timeout: 60
1920
join_token: "{{ hostvars[first_swarm_manager_host].join_token_manager }}"
20-
remote_addrs: "{{ groups['main_nodes_ips_with_port'][0] }}:2377"
21+
remote_addrs: "{{ groups['main_nodes_ips_with_port'][0] }}:2377"

‎ansible/tasks/docker_swarm/join_workers.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
- name: v2
77
add_host:
8-
hostname: "{{ groups['manager'] | map('extract', hostvars, ['ansible_host']) | join(':3000,') }}:3000"
8+
hostname: "{{ groups['manager'] | map('extract', hostvars,
9+
['ansible_host']) | join(':3000,') }}:3000"
910
groups: main_nodes_ips_with_port
1011
with_items: "{{ ansible_play_hosts | default(play_hosts) }}"
1112

@@ -14,4 +15,4 @@
1415
state: join
1516
timeout: 60
1617
join_token: "{{ hostvars[first_swarm_manager_host].join_token_worker }}"
17-
remote_addrs: "{{ groups['main_nodes_ips_with_port'][0] }}:2377"
18+
remote_addrs: "{{ groups['main_nodes_ips_with_port'][0] }}:2377"

‎ansible/tasks/install_docker.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Ensure dependencies are installed (Debian)
33
apt:
4-
update-cache: yes
4+
update-cache: true
55
name:
66
- ca-certificates
77
- curl
@@ -42,9 +42,10 @@
4242
- name: Add Docker Repository (RedHat, centOS)
4343
shell: |
4444
dnf install -y yum-utils
45-
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
45+
yum-config-manager --add-repo
46+
https://download.docker.com/linux/centos/docker-ce.repo
4647
args:
47-
warn: no
48+
warn: false
4849
when: ansible_os_family == "RedHat"
4950

5051
- name: install docker-ce (Debian, Ubuntu)

‎ansible/tasks/mk8s/deploy_app.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
dest: "/home/{{ ansible_user }}/values.yaml"
66
owner: "{{ ansible_user }}"
77
group: "{{ ansible_user }}"
8-
mode: u=rw,g=rw,o=r
8+
mode: u=rw,g=rw
99

1010
- name: Deploy app or update it with new values if already deployed
1111
block:
1212
- name: Deploy sc4s app from templates with overwrites from values.yml
13-
ansible.builtin.shell: microk8s helm3 install sc4s splunk-connect-for-syslog/splunk-connect-for-syslog -f values.yaml
13+
ansible.builtin.shell: |
14+
microk8s helm3 install sc4s
15+
splunk-connect-for-syslog/splunk-connect-for-syslog -f values.yaml
1416
args:
1517
chdir: "/home/{{ ansible_user }}/"
1618
rescue:
17-
- name: Update app with new values.yml
18-
ansible.builtin.shell: microk8s helm3 upgrade sc4s splunk-connect-for-syslog/splunk-connect-for-syslog -f values.yaml
19-
args:
20-
chdir: "/home/{{ ansible_user }}/"
19+
- name: Update app with new values.yml
20+
ansible.builtin.shell: |
21+
microk8s helm3 upgrade sc4s
22+
splunk-connect-for-syslog/splunk-connect-for-syslog -f values.yaml
23+
args:
24+
chdir: "/home/{{ ansible_user }}/"

‎ansible/tasks/mk8s/deploy_secrets.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
file: "{{ item }}"
55
with_first_found:
66
- files:
7-
- /opt/ansible/resources/k8s_secrets.yaml
8-
- /opt/charts/splunk-connect-for-syslog/secrets.yaml
7+
- /opt/ansible/resources/k8s_secrets.yaml
8+
- /opt/charts/splunk-connect-for-syslog/secrets.yaml
99

1010
- name: Create mTLS secret
1111
ansible.builtin.shell: |

0 commit comments

Comments
 (0)