Merge pull request #1 from ahmadgh9/dev

merge dev into main

.github/workflows/docker-push.yml

@@ -15,7 +15,7 @@ jobs:
       id: build-image
       uses: redhat-actions/buildah-build@v2
       with:
-        image: pryorda/vmware_exporter
+        image: ahmadgh9/vmware_exporter
         tags: latest ${{ github.sha }} ${{ github.event.release.tag_name }}
         dockerfiles: |
           ./Dockerfile

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.7-alpine
 
-LABEL MAINTAINER="Daniel Pryor <[email protected]>"
+LABEL MAINTAINER="Ahmad Ghassemi <[email protected]>"
 LABEL NAME=vmware_exporter
 
 WORKDIR /opt/vmware_exporter/

requirements.txt

@@ -1,6 +1,7 @@
-prometheus-client==0.0.19
+prometheus-client
 pytz
 pyvmomi>=6.5
 twisted>=14.0.2
 pyyaml>=5.1
 service-identity
+requests

vmware_exporter/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.18.4'
+__version__ = '0.18.5'
 __author__ = "Daniel Pryor"
 __license__ = "BSD 3-Clause License"

vmware_exporter/vmware_exporter.py

@@ -451,7 +451,7 @@ def session(self):
             try:
                 yield threads.deferToThread(
                     self._session.post,
-                    'https://{host}/rest/com/vmware/cis/session'.format(host=self.host)
+                    'https://{host}/api/session'.format(host=self.host)
                 )
             except Exception as e:
                 logging.error('Error creating vcenter API session ({})'.format(e))
@@ -468,7 +468,7 @@ def _tagIDs(self):
         session = yield self.session
         response = yield threads.deferToThread(
             session.get,
-            'https://{host}/rest/com/vmware/cis/tagging/tag'.format(host=self.host)
+            'https://{host}/api/cis/tagging/tag'.format(host=self.host)
         )
         output = []
         try:
@@ -491,7 +491,7 @@ def _attachedObjectsOnTags(self):
         }
         response = yield threads.deferToThread(
             session.post,
-            'https://{host}/rest/com/vmware/cis/tagging/tag-association?~action=list-attached-objects-on-tags'
+            'https://{host}/api/cis/tagging/tag-association?action=list-attached-objects-on-tags'
             .format(host=self.host),
             json=jsonBody
         )
@@ -518,7 +518,7 @@ def _tagNames(self):
         for tagID in tagIDs:
             response = yield threads.deferToThread(
                 session.get,
-                'https://{host}/rest/com/vmware/cis/tagging/tag/id:{tag_id}'.format(host=self.host, tag_id=tagID)
+                'https://{host}/api/cis/tagging/tag/id:{tag_id}'.format(host=self.host, tag_id=tagID)
             )
             tagObj = response.json().get('value', {})
             if tagObj:
@@ -579,6 +579,8 @@ def connection(self):
                 pwd=self.password,
                 sslContext=context,
             )
+            if vmware_connect is None:
+                raise error("could no connect to vcenter")
             return vmware_connect
 
         except vmodl.MethodFault as error: