diff --git a/.circleci/config.yml b/.circleci/config.yml index 1d07ece1..1577aa42 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 executors: circleci_xlarge: machine: - image: ubuntu-1604:202007-01 + image: ubuntu-2004:202201-02 resource_class: xlarge jobs: @@ -14,7 +14,8 @@ jobs: - run: name: Setup Python3 command: | - pyenv global 2.7.18 3.7.8 + pyenv versions + pyenv global 2.7.18 3.10.2 python --version pip --version python3 --version diff --git a/Makefile b/Makefile index 90e4d43e..95871115 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL := /bin/bash test-setup: @echo 'Install test requirements' - pip install pip==20.3.4 + pip install --upgrade pip pip install -r $(shell pwd)/tests/requirements.txt --upgrade py3k-test-setup: diff --git a/docs/ADVANCED.md b/docs/ADVANCED.md index 255a5f50..088d0e7a 100644 --- a/docs/ADVANCED.md +++ b/docs/ADVANCED.md @@ -75,7 +75,7 @@ Splunk-Ansible ships with an inventory script in `inventory/environ.py`. The scr | SPLUNK_APPS_URL | Pass in a comma-separated list of local paths or remote URLs to Splunk apps that will get installed | no | no | no | | SPLUNKBASE_USERNAME | Splunkbase username used for authentication when installing an app from [Splunkbase](https://splunkbase.splunk.com/) | no | no | no | | SPLUNKBASE_PASSWORD | Splunkbase password used for authentication when installing an app from [Splunkbase](https://splunkbase.splunk.com/) | no | no | no | -| SPLUNK_HTTP_PORT | Port to run SplunkWeb on. Default: `8000` | no | no | no | +| SPLUNK_HTTP_PORT | Port to run SplunkWeb on. To disable SplunkWeb, set to `0`. Default: `8000` | no | no | no | | SPLUNK_HTTP_ENABLESSL | Enable HTTPS on SplunkWeb | no | no | no | | SPLUNK_HTTP_ENABLESSL_CERT | Path to SSL certificate used for SplunkWeb, if HTTPS is enabled | no | no | no | | SPLUNK_HTTP_ENABLESSL_PRIVKEY | Path to SSL private key used for SplunkWeb, if HTTPS is enabled | no | no | no | diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e2643bff..1bd91404 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,8 @@ ## Navigation +* [9.0.0](#900) +* [8.2.6](#826) * [8.2.5](#825) * [8.2.4](#824) * [8.2.3.2](#8232) @@ -64,6 +66,21 @@ --- +## 9.0.0 + +#### Changes +* Support for latest major Splunk release +* Documentation updates + bugfixes + +--- + +## 8.2.6 + +#### Changes +* Bugfixes + +--- + ## 8.2.5 #### Changes diff --git a/roles/splunk_common/tasks/enable_admin_auth.yml b/roles/splunk_common/tasks/enable_admin_auth.yml index 702661a7..f5d6ca16 100644 --- a/roles/splunk_common/tasks/enable_admin_auth.yml +++ b/roles/splunk_common/tasks/enable_admin_auth.yml @@ -28,6 +28,12 @@ become_user: "{{ splunk.user }}" no_log: "{{ hide_password }}" + - name: "Delete etc/passwd if exists (Windows)" + file: + path: "{{ splunk.home }}/etc/passwd" + state: absent + when: ansible_system is match("CYGWIN*|Win32NT") + - name: "Generate user-seed.conf (Windows)" ini_file: dest: "{{ splunk.home }}/etc/system/local/user-seed.conf" diff --git a/roles/splunk_common/tasks/set_http_port.yml b/roles/splunk_common/tasks/set_http_port.yml index 725ec0ef..84c93ded 100644 --- a/roles/splunk_common/tasks/set_http_port.yml +++ b/roles/splunk_common/tasks/set_http_port.yml @@ -1,4 +1,14 @@ --- +- name: Disable Web UI + ini_file: + dest: "{{ splunk.home }}/etc/system/local/web.conf" + section: settings + option: "startwebserver" + value: "{{ splunk.http_port }}" + owner: "{{ splunk.user }}" + group: "{{ splunk.group }}" + when: splunk.http_port == 0 + - name: Set HTTP Port ini_file: dest: "{{ splunk.home }}/etc/system/local/web.conf" @@ -7,3 +17,4 @@ value: "{{ splunk.http_port }}" owner: "{{ splunk.user }}" group: "{{ splunk.group }}" + when: splunk.http_port != 0 diff --git a/roles/splunk_common/vars/main.yml b/roles/splunk_common/vars/main.yml index 8966e65e..fa45fc89 100644 --- a/roles/splunk_common/vars/main.yml +++ b/roles/splunk_common/vars/main.yml @@ -1,10 +1,10 @@ --- default_apps: [ "legacy", "splunk_gdi", "SplunkForwarder", "SplunkLightForwarder", "gettingstarted", "splunk-dashboard-studio", - "alert_webhook", "splunk_httpinput", "introspection_generator_addon", "user-prefs", "splunk_essentials_8_2", + "alert_webhook", "splunk_httpinput", "introspection_generator_addon", "user-prefs", "splunk_essentials_9_0", "appsbrowser", "framework", "learned", "launcher", "alert_logevent", "sample_app", "python_upgrade_readiness_app", "splunk_instrumentation", "search", "splunk_archiver", "splunk_monitoring_console", "splunk_rapid_diag", "_splunk_config", "splunk_enterprise_on_docker", "splunk_forwarder_on_docker", "journald_input", - "splunk_metrics_workspace", "splunk_internal_metrics", "splunk_telemetry", "splunk_secure_gateway" ] + "splunk_metrics_workspace", "splunk_internal_metrics", "splunk_telemetry", "splunk_secure_gateway", "splunk_assist" ] itsi_apps: [ "DA-ITSI-APPSERVER", "DA-ITSI-DATABASE", "DA-ITSI-EUEM", "DA-ITSI-LB", "DA-ITSI-OS", "DA-ITSI-STORAGE", "DA-ITSI-VIRTUALIZATION", "DA-ITSI-WEBSERVER", "SA-ITOA", "SA-ITSI-ATAD", "SA-UserAccess", "SA-ITSI-CustomModuleViz", "SA-ITSI-MetricAD", "SA-ITSI-Licensechecker", "itsi", "splunk_app_infrastructure" ] diff --git a/roles/splunk_monitor/tasks/main.yml b/roles/splunk_monitor/tasks/main.yml index 8d874e91..ace0056e 100644 --- a/roles/splunk_monitor/tasks/main.yml +++ b/roles/splunk_monitor/tasks/main.yml @@ -25,7 +25,7 @@ - name: Fetch clusterMaster peers uri: - url: "{{ cert_prefix }}://{{ splunk.cluster_master_url }}:{{ splunk.svc_port }}/services/cluster/master/peers?output_mode=json" + url: "{{ cert_prefix }}://{{ splunk.cluster_master_url }}:{{ splunk.svc_port }}/services/cluster/master/peers?output_mode=json&count=0" method: GET user: "{{ splunk.admin_user }}" password: "{{ splunk.password }}" @@ -49,7 +49,7 @@ - name: Fetch distributed peers when cm is defined uri: - url: "{{ cert_prefix }}://127.0.0.1:{{ splunk.svc_port }}/services/search/distributed/peers?output_mode=json" + url: "{{ cert_prefix }}://127.0.0.1:{{ splunk.svc_port }}/services/search/distributed/peers?output_mode=json&count=0" method: GET user: "{{ splunk.admin_user }}" password: "{{ splunk.password }}" @@ -70,7 +70,7 @@ - name: Fetch distributed peers uri: - url: "{{ cert_prefix }}://127.0.0.1:{{ splunk.svc_port }}/services/search/distributed/peers?output_mode=json" + url: "{{ cert_prefix }}://127.0.0.1:{{ splunk.svc_port }}/services/search/distributed/peers?output_mode=json&count=0" method: GET user: "{{ splunk.admin_user }}" password: "{{ splunk.password }}"