Fix the usage of the manager-apps dir on the cm from 9.0.0 on

Author: splunkenizer

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [2.2.2](https://github.com/splunk/splunk-platform-automator/releases/tag/v2.2.2) - tbd
+
+### Fixed
+
+- Fix the usage of the manager-apps dir on the cm from 9.0.0 on
+
 ## [2.2.1](https://github.com/splunk/splunk-platform-automator/releases/tag/v2.2.1) - 2024-02-11
 
 ### Fixed

ansible/group_vars/all/dynamic.yml

@@ -96,7 +96,7 @@ splunk_manager_uri_var: "{%- if splunk_installed_version is version_compare('9.0
 splunk_clustermanager_var: "{%- if splunk_installed_version is version_compare('9.0', '>=') -%}clustermanager{%- else -%}clustermaster{%- endif -%}"
 splunk_cluster_manager_mode: "{%- if splunk_installed_version is version_compare('9.0', '>=') -%}manager{%- else -%}master{%- endif -%}"
 splunk_cluster_peer_mode: "{%- if splunk_installed_version is version_compare('9.0', '>=') -%}peer{%- else -%}slave{%- endif -%}"
-
+splunk_cluster_manager_apps: "{%- if splunk_installed_version is version_compare('9.0', '>=') -%}manager-apps{%- else -%}master-apps{%- endif -%}"
 
 # Multisite Indexer Cluster
 splunk_idxc_available_sites: "{{ idxc_available_sites|default([])|join(',') }}"

ansible/roles/cluster_manager/tasks/main.yml

@@ -108,7 +108,7 @@
     name: baseconfig_app
   vars:
     app_name: 'org_indexer_volume_indexes'
-    app_path: '{{splunk_home}}/etc/master-apps'
+    app_path: '{{splunk_home}}/etc/{{splunk_cluster_manager_apps}}'
 
 - name: apply baseconfig app org_all_indexes
   tags:
@@ -120,7 +120,7 @@
     name: baseconfig_app
   vars:
     app_name: 'org_all_indexes'
-    app_path: '{{splunk_home}}/etc/master-apps'
+    app_path: '{{splunk_home}}/etc/{{splunk_cluster_manager_apps}}'
 
 - name: apply baseconfig app org_s2_indexer_indexes
   tags:
@@ -132,7 +132,7 @@
     name: baseconfig_app
   vars:
     app_name: 'org_s2_indexer_indexes'
-    app_path: '{{splunk_home}}/etc/master-apps'
+    app_path: '{{splunk_home}}/etc/{{splunk_cluster_manager_apps}}'
   when: splunk_volume_defaults.remotePath is defined
 
 - name: apply baseconfig app org_full_license_server
@@ -145,7 +145,7 @@
     name: baseconfig_app
   vars:
     app_name: 'org_full_license_server'
-    app_path: '{{splunk_home}}/etc/master-apps'
+    app_path: '{{splunk_home}}/etc/{{splunk_cluster_manager_apps}}'
   when: splunk_license_manager|default()|length > 0
 
 - name: call update_dserver from role monitoring_console

ansible/roles/splunk_software/templates/home/splunk/bashrc.splunk.j2

@@ -2,11 +2,23 @@
 export SPLUNK_HOME={{ splunk_home }}
 export PATH=$PATH:$SPLUNK_HOME/bin
 
+# Functions
+cdmanager()
+{
+    # Check if there is a manager-apps dir
+    if [ -d $SPLUNK_HOME/etc/manager-apps ]; 
+    then
+        cd $SPLUNK_HOME/etc/manager-apps
+    else 
+        cd $SPLUNK_HOME/etc/master-apps
+    fi
+}
+
 # Aliases
 alias cs="cd $SPLUNK_HOME"
 alias ce="cd $SPLUNK_HOME/etc"
 alias ca="cd $SPLUNK_HOME/etc/apps"
-alias cm="cd $SPLUNK_HOME/etc/master-apps"
+alias cm=cdmanager
 alias ch="cd $SPLUNK_HOME/etc/shcluster/apps"
 alias cdd="cd $SPLUNK_HOME/etc/deployment-apps"
 alias cdl="cd $SPLUNK_HOME/var/log/splunk"