vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move the total image count stat back to the prom stat worker

Browse source
This commit is contained in:
Jake Moshenko 2017-02-22 11:24:41 -05:00
parent deb2b1b003
commit add6b654ae
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/model/image.py
View file

@ -500,14 +500,6 @@ def get_images_eligible_for_scan(clair_version):
return get_image_with_storage_and_parent_base().where(Image.security_indexed_engine < clair_version) return get_image_with_storage_and_parent_base().where(Image.security_indexed_engine < clair_version)
def get_count_of_images_eligible_for_scan(clair_version):
""" Returns a query that gives all images eligible for a clair scan """
# TODO(jzelinskie): Get this value from the slab allocator rather than querying the db
# This was the previous implementation:
# return get_images_eligible_for_scan(clair_version).count()
return 0
def get_image_with_storage_and_parent_base(): def get_image_with_storage_and_parent_base():
Parent = Image.alias() Parent = Image.alias()
ParentImageStorage = ImageStorage.alias() ParentImageStorage = ImageStorage.alias()

6
workers/globalpromstats.py
View file

@ -5,9 +5,9 @@ import features
from app import app, metric_queue from app import app, metric_queue
from data.database import UseThenDisconnect from data.database import UseThenDisconnect
from data import model from data import model
from data.model.image import total_image_count, get_count_of_images_eligible_for_scan from data.model.image import total_image_count
from util.locking import GlobalLock, LockNotAcquiredException from util.locking import GlobalLock, LockNotAcquiredException
from workers.securityworker import unscanned_images_gauge, images_gauge from workers.securityworker import images_gauge
from workers.worker import Worker from workers.worker import Worker
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -43,6 +43,8 @@ class GlobalPrometheusStatsWorker(Worker):
metric_queue.org_count.Set(model.organization.get_active_org_count()) metric_queue.org_count.Set(model.organization.get_active_org_count())
metric_queue.robot_count.Set(model.user.get_robot_count()) metric_queue.robot_count.Set(model.user.get_robot_count())
images_gauge.Set(total_image_count())
def main(): def main():
logging.config.fileConfig('conf/logging_debug.conf', disable_existing_loggers=False) logging.config.fileConfig('conf/logging_debug.conf', disable_existing_loggers=False)

4
workers/securityworker.py
View file

@ -7,7 +7,7 @@ from app import app, secscan_api, prometheus
from workers.worker import Worker from workers.worker import Worker
from data.database import UseThenDisconnect from data.database import UseThenDisconnect
from data.model.image import (get_images_eligible_for_scan, get_max_id_for_sec_scan, from data.model.image import (get_images_eligible_for_scan, get_max_id_for_sec_scan,
get_min_id_for_sec_scan, get_image_id, total_image_count) get_min_id_for_sec_scan, get_image_id)
from util.secscan.api import SecurityConfigValidator from util.secscan.api import SecurityConfigValidator
from util.secscan.analyzer import LayerAnalyzer, PreemptedException from util.secscan.analyzer import LayerAnalyzer, PreemptedException
from util.migrate.allocator import yield_random_entries from util.migrate.allocator import yield_random_entries
@ -64,8 +64,6 @@ class SecurityWorker(Worker):
abt.set() abt.set()
unscanned_images_gauge.Set(num_remaining) unscanned_images_gauge.Set(num_remaining)
images_gauge.Set(total_image_count())
# If we reach this point, we analyzed every images up to max_id, next time the worker runs, # If we reach this point, we analyzed every images up to max_id, next time the worker runs,
# we want to start from the next image. # we want to start from the next image.