Skip to content

Commit

Permalink
Merge pull request #38 from zenoss/feature/ZPS-8692
Browse files Browse the repository at this point in the history
Feature/zps 8692
  • Loading branch information
jpeacock-zenoss authored Sep 7, 2023
2 parents 010251d + 0eef3a8 commit 696432a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
6 changes: 4 additions & 2 deletions ZenPacks/zenoss/PostgreSQL/Table.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,7 @@ class Table(DeviceComponent, ManagedEntity, CollectedOrModeledMixin):
event_key = "ComponentId"

def device(self):
return self.database().device()

db = self.database()
if db:
return db.device()
return None
5 changes: 5 additions & 0 deletions docs/body.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ zSnmpMonitorIgnore property to True and remodel.
Changes
---------------

1.0.13

* Make PostgreSQL table modeling optional (ZPS-8554)
* Tested with Zenoss Cloud, Zenoss 6.7.0 and Service Impact 5.6.0

1.0.12

* Resolved isuue with error in pg8000 library on Ubuntu OS (ZPS-7424)
Expand Down
4 changes: 4 additions & 0 deletions docs/releases.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Releases
--------

Version 1.0.13-<a rel="nofollow" class="external" href="https://delivery.zenoss.com/">Download</a>
Released on 2023/9/7
Compatible with Zenoss 6.x, Zenoss Cloud and Service Impact 5.6.1

Version 1.0.12-<a rel="nofollow" class="external" href="https://delivery.zenoss.com/">Download</a>
Released on 2021/1/14
Compatible with Zenoss 6.4.1 - 6.5.0, Zenoss Cloud and Service Impact 5.5.3
Expand Down

0 comments on commit 696432a

Please sign in to comment.