Skip to content

Added support for environment variables. #69

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 18, 2017
Merged

Added support for environment variables. #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions pyzabbix/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import json
import logging
import os
import ssl
import sys

Expand Down Expand Up @@ -122,17 +123,19 @@ class ZabbixAPI(object):
"""ZabbixAPI class, implement interface to zabbix api.

:type url: str
:param url: URL to zabbix api. Default: `https://localhost/zabbix`
:param url: URL to zabbix api. Default: `ZABBIX_URL` or
`https://localhost/zabbix`

:type use_authenticate: bool
:param use_authenticate: Use `user.authenticate` method if `True` else
`user.login`.

:type user: str
:param user: Zabbix user name. Default: `admin`.
:param user: Zabbix user name. Default: `ZABBIX_USER` or `admin`.

:type password: str
:param password: Zabbix user password. Default `zabbix`.
:param password: Zabbix user password. Default `ZABBIX_PASSWORD` or
`zabbix`.

>>> from pyzabbix import ZabbixAPI
>>> z = ZabbixAPI('https://zabbix.server', user='Admin', password='zabbix')
Expand All @@ -148,8 +151,13 @@ class ZabbixAPI(object):
>>> z.do_request('host.getobjects', {'status': 1})
"""

def __init__(self, url='https://localhost/zabbix',
use_authenticate=False, user='Admin', password='zabbix'):
def __init__(self, url=None, use_authenticate=False, user=None,
password=None):

url = url or os.environ.get('ZABBIX_URL') or 'https://localhost/zabbix'
user = user or os.environ.get('ZABBIX_USER') or 'Admin'
password = password or os.environ.get('ZABBIX_PASSWORD') or 'zabbix'

self.use_authenticate = use_authenticate
self.auth = None
self.url = url + '/api_jsonrpc.php'
Expand Down