-
Notifications
You must be signed in to change notification settings - Fork 371
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adding more deployment endpoint code to Service #158
Open
vegitron
wants to merge
1
commit into
splunk:develop
Choose a base branch
from
vegitron:develop
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,10 +84,11 @@ | |
PATH_CAPABILITIES = "authorization/capabilities/" | ||
PATH_CONF = "configs/conf-%s/" | ||
PATH_PROPERTIES = "properties/" | ||
PATH_DEPLOYMENT_APPS = "deployment/server/applications" | ||
PATH_DEPLOYMENT_CLIENTS = "deployment/client/" | ||
PATH_DEPLOYMENT_TENANTS = "deployment/tenants/" | ||
PATH_DEPLOYMENT_SERVERS = "deployment/server/" | ||
PATH_DEPLOYMENT_SERVERCLASSES = "deployment/serverclass/" | ||
PATH_DEPLOYMENT_SERVERCLASSES = "deployment/server/serverclasses" | ||
PATH_EVENT_TYPES = "saved/eventtypes/" | ||
PATH_FIRED_ALERTS = "alerts/fired_alerts/" | ||
PATH_INDEXES = "data/indexes/" | ||
|
@@ -415,6 +416,22 @@ def capabilities(self): | |
response = self.get(PATH_CAPABILITIES) | ||
return _load_atom(response, MATCH_ENTRY_CONTENT).capabilities | ||
|
||
@property | ||
def deployment_apps(self): | ||
"""Returns the collection of deployment apps on this Splunk instance. | ||
|
||
:return: A :class:`ReadOnlyCollection` of :class:`DeploymentApp` entities. | ||
""" | ||
return DeploymentApps(self) | ||
|
||
@property | ||
def deployment_clients(self): | ||
"""Returns the collection of deployment clients on this Splunk instance. | ||
|
||
:return: A :class:`ReadOnlyCollection` of :class:`DeploymentClient` entities. | ||
""" | ||
return DeploymentClient(self) | ||
|
||
@property | ||
def event_types(self): | ||
"""Returns the collection of event types defined in this Splunk instance. | ||
|
@@ -500,6 +517,14 @@ def modular_input_kinds(self): | |
else: | ||
raise IllegalOperationException("Modular inputs are not supported before Splunk version 5.") | ||
|
||
@property | ||
def server_classes(self): | ||
"""Returns the collection of server classes on this Splunk instance. | ||
|
||
:return: A :class:`ReadOnlyCollection` of :class:`ServerClass` entities. | ||
""" | ||
return ServerClasses(self) | ||
|
||
@property | ||
def storage_passwords(self): | ||
"""Returns the collection of the storage passwords on this Splunk instance. | ||
|
@@ -1883,6 +1908,25 @@ def count(self): | |
""" | ||
return int(self.content.get('triggered_alert_count', 0)) | ||
|
||
class DeploymentApp(Entity): | ||
pass | ||
|
||
|
||
class DeploymentApps(Collection): | ||
"""This class represents a collection of deployment apps.""" | ||
def __init__(self, service): | ||
Collection.__init__(self, service, PATH_DEPLOYMENT_APPS, item=ServerClass) | ||
|
||
class DeploymentClient(Entity): | ||
pass | ||
|
||
|
||
class DeploymentClient(Collection): | ||
"""This class represents a collection of deployment clients.""" | ||
def __init__(self, service): | ||
Collection.__init__(self, service, PATH_DEPLOYMENT_CLIENTS, item=ServerClass) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You'll want to change the name of the collection to |
||
|
||
|
||
|
||
class Indexes(Collection): | ||
"""This class contains the collection of indexes in this Splunk instance. | ||
|
@@ -3302,6 +3346,16 @@ def update(self, **kwargs): | |
return self | ||
|
||
|
||
class ServerClass(Entity): | ||
pass | ||
|
||
|
||
class ServerClasses(Collection): | ||
"""This class represents a collection of server classes.""" | ||
def __init__(self, service): | ||
Collection.__init__(self, service, PATH_DEPLOYMENT_SERVERCLASSES, item=ServerClass) | ||
|
||
|
||
class User(Entity): | ||
"""This class represents a Splunk user. | ||
""" | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you meant
item= DeploymentApp