Skip to content

Commit

Permalink
Merge pull request #775 from splunk/develop
Browse files Browse the repository at this point in the history
Release 9.0.8 and 9.1.3
  • Loading branch information
adityapinglesf authored Jan 23, 2024
2 parents baff607 + 1251a12 commit 447b02f
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
# Order matters: The last matching pattern has the most precedence.

# Default owners for everything in docker-splunk:
* @splunk/if-01
* @splunk/splunk-internal-dev-services

18 changes: 18 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
## Changelog

## Navigation
* [9.1.3](#913)
* [9.1.2](#912)
* [9.1.1](#911)
* [9.1.0.2](#9102)
* [9.1.0.1](#9101)
* [9.0.8](#908)
* [9.0.7](#907)
* [9.0.6](#906)
* [9.0.5.1](#9051)
Expand Down Expand Up @@ -80,6 +82,14 @@

---

## 9.1.3

#### Changes
* Support for latest major Splunk release
* Documentation updates

---

## 9.1.2

#### Changes
Expand Down Expand Up @@ -112,6 +122,14 @@

---

## 9.0.8

#### Changes
* Support for latest major Splunk release
* Documentation updates

---

## 9.0.7

#### Changes
Expand Down
2 changes: 2 additions & 0 deletions roles/splunk_common/tasks/install_apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
timeout: 120
validate_certs: no
force: yes
url_username: "{{ lookup('env', 'ARTIFACTORY_USER') }}"
url_password: "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"
register: app_remote
when:
- app_url is match("^(https?|file)://.*")
Expand Down
5 changes: 5 additions & 0 deletions roles/splunk_common/tasks/set_mgmt_port.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@
group: "{{ splunk.group }}"
when:
- "'svc_port' in splunk"
register: set_mgmt_port

# Restart only when Splunk is running and when any of the above have changed
- include_tasks: ../handlers/restart_splunk.yml
when: set_mgmt_port is changed
4 changes: 2 additions & 2 deletions roles/splunk_search_head/tasks/setup_multisite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
become_user: "{{ splunk.user }}"
register: set_new_master
until: set_new_master.rc == 0 or (set_new_master.rc != 0 and "Cannot edit this searchhead. Use 'splunk edit cluster-master' to edit information for this searchhead." in set_new_master.stderr) or (set_new_master.rc != 0 and "Cannot edit this searchhead. Use 'splunk edit cluster-manager' to edit information for this searchhead." in set_new_master.stderr)
failed_when: (set_new_master.rc != 0 and "Cannot edit this searchhead. Use 'splunk edit cluster-master' to edit information for this searchhead." not in set_new_master.stderr) or (set_new_master.rc != 0 and "Cannot edit this searchhead. Use 'splunk edit cluster-manager' to edit information for this searchhead." not in set_new_master.stderr)
failed_when: set_new_master.rc != 0 and ("Cannot edit this searchhead. Use 'splunk edit cluster-master' to edit information for this searchhead." not in set_new_master.stderr and "Cannot edit this searchhead. Use 'splunk edit cluster-manager' to edit information for this searchhead." not in set_new_master.stderr)
changed_when: set_new_master.rc == 0
retries: "{{ retry_num }}"
delay: "{{ retry_delay }}"
Expand All @@ -40,4 +40,4 @@
notify:
- Restart the splunkd service
no_log: "{{ hide_password }}"
failed_when: (set_associated_site.rc != 0 and 'No change in master or secret or site.' not in set_associated_site.stderr) or (set_associated_site.rc != 0 and 'No change in manager or secret or site.' not in set_associated_site.stderr)
failed_when: set_associated_site.rc != 0 and ('No change in master or secret or site.' not in set_associated_site.stderr and 'No change in manager or secret or site.' not in set_associated_site.stderr)

0 comments on commit 447b02f

Please sign in to comment.