Skip to content

Commit

Permalink
Merge pull request #1 from hubblestack/3.0
Browse files Browse the repository at this point in the history 
3.0
  • Loading branch information
@daveed12 @web-flow
daveed12 authored and web-flow committed Nov 27, 2019
2 parents ba55087 + 3f0bca5 commit af1dc0f
Show file tree
Hide file tree
Showing 19 changed files with 56 additions and 65 deletions.
11 changes: 1 addition & 10 deletions hubblestack/hec/opt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,7 @@ def _get_splunk_options(space, modality, **kw):
sfr = [sfr]
for opt in sfr:
final_opts = base_opts.copy()
if modality is 'grains.get':
options_for_grains_config &= set(opt.keys())
options = options_for_grains_config
elif 'grains.get' in MODALITIES:
options = set(opt.keys()) - options_for_grains_config
else:
options = set(opt.keys())
for k in options:
for k in opt:
j = nicknames.get(k, k)
if j in final_opts:
# if j is one of the args that can be overridden and has been provided then do not update it
Expand All @@ -106,8 +99,6 @@ def _get_splunk_options(space, modality, **kw):
final_opts[j] = opt[k]

if REQUIRED in final_opts.values():
final_opts[j] = opt[k]
if modality is 'config.get' and REQUIRED in final_opts.values():
raise Exception('{0} must be specified in the {1} configs!'.format(req, space))
ret.append(final_opts)

Expand Down
6 changes: 3 additions & 3 deletions pkg/amazonlinux2016.09/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/centos6/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/centos7/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/coreos/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/debian10/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/debian7/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/debian8/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/debian9/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/dev/amazonlinux2016.09/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/dev/centos6/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
croniter
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
vulners
6 changes: 3 additions & 3 deletions pkg/dev/centos7/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/dev/coreos/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/dev/debian10/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/dev/debian7/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/dev/debian8/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
6 changes: 3 additions & 3 deletions pkg/dev/debian9/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
8 changes: 4 additions & 4 deletions pkg/windows/pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ botocore
pygit2
gitpython
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners
vulners
6 changes: 3 additions & 3 deletions pyinstaller-requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ salt-ssh
gitpython
pyinotify
cffi
azure
azure-storage-common
azure-storage-blob
azure==4.0.0
azure-storage-common==2.1.0
azure-storage-blob==2.1.0
croniter
vulners

0 comments on commit af1dc0f

Please sign in to comment.