Commit42c3eb5

committed

fix: add support for Zabbix API v6.4

1 parent718d958 commit42c3eb5Copy full SHA for 42c3eb5

File tree

+19

-4

lines changed

+19

-4

lines changed

Lines changed: 3 additions & 0 deletions

Lines changed: 9 additions & 0 deletions

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`fromcollectionsimportOrderedDict`
`6`	`6`
`7`	`7`
	`8`	`+fromdistutils.versionimportLooseVersion`
`8`	`9`	`importurllib.requestasurllib2`
`9`	`10`
`10`	`11`
`@@ -13,20 +14,22 @@ class Request(object):`
`13`	`14`	`def__init__(self,url,user,passwd):`
`14`	`15`	`self._url,self._user,self._passwd=url,user,passwd`
`15`	`16`	`self._id,self._auth_tocken=0,None`
`16`		`-`
	`17`	`+self._api_version=self.post(method='apiinfo.version',params=[])`
	`18`	`+`
`17`	`19`	`defset_user(self,user):`
`18`	`20`	`self._user=user`
`19`		`-`
	`21`	`+`
`20`	`22`	`defset_passwd(self,passwd):`
`21`	`23`	`self._passwd=passwd`
`22`		`-`
	`24`	`+`
`23`	`25`	`def_auth(self):`
`24`	`26`	`ifself._auth_tockenisNone:`
`25`	`27`	`ifnotself._user:`
`26`	`28`	`returnNone`
	`29`	`+user_field='user'ifLooseVersion(self._api_version)<LooseVersion('6.4')else'username'`
`27`	`30`	`self._auth_tocken=self.post(`
`28`	`31`	`'user.login',`
`29`		`- {'user':self._user,'password':self._passwd})`
	`32`	`+ {user_field:self._user,'password':self._passwd})`
`30`	`33`	`returnself._auth_tocken`
`31`	`34`
`32`	`35`	`def_get_id(self):`

Comments

(0)