Skip to content

Commit f439067

Browse files
authored
Merge pull request #39 from gsparks/PIE-450_Add_new_events_and_activities_sourcetypes
(PIE-450) Add puppet:events_summary and puppet:activity sourcetypes
2 parents 64097d7 + a551ee6 commit f439067

File tree

9 files changed

+49
-5
lines changed

9 files changed

+49
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For detailed report generation, you will need to now install and configure the [
2020

2121
Advanced Configuration
2222
----------------
23-
All report views support using custom indexes for storing event data. They accomplish this with a series of advanced search macros. The queries assume each sourcetype can be stored in it's own index (facts, summary reports, detailed reports, bolt events, action events, Puppet Enterprise metrics).
23+
All report views support using custom indexes for storing event data. They accomplish this with a series of advanced search macros. The queries assume each sourcetype can be stored in it's own index (facts, summary reports, detailed reports, bolt events, action events, activities, Puppet Enterprise metrics).
2424

2525
There is one top level macro, `puppet_index` which defaults to "", if you configure the HEC to use a different index and want all Puppet in that index, change that value here to be `index=puppetindexname`.
2626

README/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Release Notes
22
==============
33

4+
3.0.2:
5+
New Features:
6+
- puppet:events_summary and puppet:activity sourcetypes added.
7+
8+
Fixes:
9+
- The searches that are used in the Overview tab to display resources under the "# of Resources" element and associated table used to display the number of reports. They have been corrected to display the number of resources.
10+
- Development workflow updated.
11+
412
3.0.1:
513
**Breaking Changes**:
614
- Alert Actions are now moved to https://github.com/puppetlabs/TA-puppet-alert-actions for better compatibility of this App for users who don't use or need the addons

README/DEVELOPING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ In order to load this module properly into the Splunk Add-On builder for develop
1111
```
1212
$ git checkout -b 'my working branch'
1313
14-
$ COPYFILE_DISABLE=1 tar -C .. --exclude=".git" --exclude="local/" --exclude="metadata/local.meta" --exclude="tmpdir" --owner=0 --group=0 --exclude=".DS_Store" --exclude=".gitignore" --exclude="default/.DS_Store" --exclude="default/data/.DS_Store" --exclude="default/data/ui/.DS_Store" --exclude=".vscode" -czvf tmpdir/TA-puppet-report-viewer.tar.gz TA-puppet-report-viewer
14+
$ COPYFILE_DISABLE=1 tar -C .. --exclude=".git" --exclude="local/" --exclude="metadata/local.meta" --exclude="tmpdir" --exclude=".DS_Store" --exclude=".gitignore" --exclude="default/.DS_Store" --exclude="default/data/.DS_Store" --exclude="default/data/ui/.DS_Store" --exclude=".vscode" -czvf tmpdir/TA-puppet-report-viewer.tar.gz TA-puppet-report-viewer
1515
1616
To add your finished work back to the repo:
1717
- Export the build from the Splunk Add-On tool

app.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"id": {
66
"group": null,
77
"name": "TA-puppet-report-viewer",
8-
"version": "3.0.1"
8+
"version": "3.0.2"
99
},
1010
"author": [
1111
{

default/app.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build = 3
77

88
[launcher]
99
author = Puppet, Inc.
10-
version = 3.0.1
10+
version = 3.0.2
1111
description = Application with view Puppet data in Splunk
1212

1313
[ui]

default/macros.conf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ iseval = 0
3333
definition = `puppet_index`
3434
iseval = 0
3535

36+
[puppet_events_index]
37+
# add the name of your index here if it is not main index=puppet_index
38+
definition = `puppet_index`
39+
iseval = 0
40+
41+
[puppet_activity_index]
42+
# add the name of your index here if it is not main index=puppet_index
43+
definition = `puppet_index`
44+
iseval = 0
45+
3646
[puppet_run_index]
3747
# add the name of your index here if it is not main index=puppet_index
3848
definition = `puppet_summary_index` OR `puppet_detailed_index` OR `puppet_facts_index`

default/props.conf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,21 @@ TRUNCATE = 0
5252
category = Puppet Data
5353
pulldown_type = 1
5454

55+
[puppet:events_summary]
56+
AUTO_KV_JSON = 0
57+
INDEXED_EXTRACTIONS = json
58+
NO_BINARY_CHECK = 1
59+
SHOULD_LINEMERGE = 0
60+
TRUNCATE = 0
61+
category = Puppet Data
62+
pulldown_type = 1
63+
64+
[puppet:activity]
65+
AUTO_KV_JSON = 0
66+
INDEXED_EXTRACTIONS = json
67+
NO_BINARY_CHECK = 1
68+
SHOULD_LINEMERGE = 0
69+
TRUNCATE = 0
70+
category = Puppet Data
71+
pulldown_type = 1
72+

local/app.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build = 4
77

88
[launcher]
99
author = Puppet, Inc.
10-
version = 3.0.1
10+
version = 3.0.2
1111

1212
[ui]
1313
is_visible = 1

metadata/default.meta

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,12 @@ owner = admin
4141

4242
[macros/puppet_all_index]
4343
export = none
44+
owner = admin
45+
46+
[macros/puppet_events_index]
47+
export = none
48+
owner = admin
49+
50+
[macros/puppet_activity_index]
51+
export = none
4452
owner = admin

0 commit comments

Comments
 (0)