Merge pull request #16105 from Security-Onion-Solutions/fixESHEAP

Add default esheap value so nodes highstate without the pillar value
2026-07-24 17:55:42 +02:00 · 2026-07-23 16:02:49 -04:00 · 2026-07-23 15:16:26 -04:00 · 2026-07-22 08:44:08 -04:00 · 2026-07-17 16:10:47 -04:00 · 2026-07-17 11:55:09 -04:00
2 changed files with 3 additions and 1 deletions
@@ -1,5 +1,6 @@
 elasticsearch:
  enabled: false
  esheap: '600m'
  version: 9.3.7
  index_clean: true
  data_retention_method: DLM
@@ -1,10 +1,11 @@
 {% import 'vars/init.map.jinja' as INIT %}
 {% import_yaml 'elasticsearch/defaults.yaml' as ELASTICSEARCHDEFAULTS %}
 {%
  set ELASTICSEARCH_GLOBALS = {
    'elasticsearch': {
      'es_cluster_name': INIT.PILLAR.elasticsearch.config.cluster.name,
-      'es_heap': INIT.PILLAR.elasticsearch.esheap
+      'es_heap': INIT.PILLAR.elasticsearch.get('esheap', ELASTICSEARCHDEFAULTS.elasticsearch.esheap)
    }
  }
 %}
Author	SHA1	Message	Date
Josh PattersonandGitHub	9ad632a63a	Merge pull request #16105 from Security-Onion-Solutions/fixESHEAP Add default esheap value so nodes highstate without the pillar value	2026-07-23 16:02:49 -04:00
Josh Patterson	6bd3c414bb	Add default esheap value so nodes highstate without the pillar value Previously salt/vars/elasticsearch.map.jinja read the elasticsearch heap size via a raw pillar access (INIT.PILLAR.elasticsearch.esheap). If the esheap key was missing from a minion pillar, building GLOBALS raised 'dict object has no attribute esheap', cascading into every state that imports GLOBALS (elasticsearch.enabled, logstash.config, telegraf.config, etc.) and blocking highstate entirely. Add an esheap default ('600m', matching the es_heapsize() floor) to elasticsearch/defaults.yaml and fall back to it via dict .get() so a missing pillar value degrades gracefully. The per-node pillar value still wins when present.	2026-07-23 15:16:26 -04:00
Josh PattersonandGitHub	e2fc9e0325	Merge pull request #16094 from Security-Onion-Solutions/saltthangs Saltthangs	2026-07-22 08:44:08 -04:00
Josh PattersonandGitHub	ce0095154b	Merge pull request #16082 from Security-Onion-Solutions/saltthangs add date and time to output	2026-07-17 16:10:47 -04:00
Josh PattersonandGitHub	7b58c67a02	Merge pull request #16080 from Security-Onion-Solutions/saltthangs Saltthangs	2026-07-17 11:55:09 -04:00
Josh PattersonandGitHub	28b3a54a27	Merge pull request #16077 from Security-Onion-Solutions/saltthangs so-salt-minion-wait: report ready immediately when already ready	2026-07-17 10:14:55 -04:00
Josh PattersonandGitHub	403d846a89	Merge pull request #16076 from Security-Onion-Solutions/saltthangs Saltthangs	2026-07-16 18:10:50 -04:00
Josh PattersonandGitHub	33ed6359bb	Merge pull request #16072 from Security-Onion-Solutions/saltthangs Saltthangs	2026-07-15 15:31:08 -04:00