Skip to content

Commit

Permalink
Merge pull request #175 from pyouroboros/develop
Browse files Browse the repository at this point in the history
v1.1.1 Merge
  • Loading branch information
dirtycajunrice authored Feb 1, 2019
2 parents 3ef4dfa + bd35656 commit cf6b8a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyouroboros/dataexporters.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self, config):

def add(self, label, socket):
if self.config.data_export == "prometheus" and self.enabled:
self.prometheus.update(label, socket)
self.prometheus.update(label, socket)

elif self.config.data_export == "influxdb" and self.enabled:
if label == "all":
Expand Down
4 changes: 2 additions & 2 deletions pyouroboros/dockerclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ def monitor_filter(self):
continue
elif not self.config.labels_only and self.config.monitor and container.name in self.config.monitor \
and container.name not in self.config.ignore:
monitored_containers.append(container)
monitored_containers.append(container)
elif not self.config.labels_only and container.name not in self.config.ignore:
monitored_containers.append(container)
monitored_containers.append(container)

self.data_manager.monitored_containers[self.socket] = len(monitored_containers)
self.data_manager.set(self.socket)
Expand Down

0 comments on commit cf6b8a3

Please sign in to comment.