mirror of
				https://github.com/KevinMidboe/mktxp-no-cli.git
				synced 2025-10-29 17:50:23 +00:00 
			
		
		
		
	simple queue, parallel router fetch as_completed , config autoupdate fixes
This commit is contained in:
		@@ -15,31 +15,37 @@
 | 
			
		||||
from mktxp.datasource.base_ds import BaseDSProcessor
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class QueueTreeMetricsDataSource:
 | 
			
		||||
    ''' Queue Tree Metrics data provider
 | 
			
		||||
class QueueMetricsDataSource:
 | 
			
		||||
    ''' Queue Metrics data provider
 | 
			
		||||
    '''             
 | 
			
		||||
    @staticmethod    
 | 
			
		||||
    def metric_records(router_entry, *, metric_labels = None):
 | 
			
		||||
    def metric_records(router_entry, *, metric_labels = None, kind = 'tree'):
 | 
			
		||||
        if metric_labels is None:
 | 
			
		||||
            metric_labels = []                
 | 
			
		||||
        try:
 | 
			
		||||
            queue_tree_records = router_entry.api_connection.router_api().get_resource('/queue/tree/').get()
 | 
			
		||||
            return BaseDSProcessor.trimmed_records(router_entry, router_records = queue_tree_records, metric_labels = metric_labels)
 | 
			
		||||
            queue_records = router_entry.api_connection.router_api().get_resource(f'/queue/{kind}/').get()
 | 
			
		||||
            queue_records = BaseDSProcessor.trimmed_records(router_entry, router_records = queue_records, metric_labels = metric_labels)            
 | 
			
		||||
        except Exception as exc:
 | 
			
		||||
            print(f'Error getting system resource info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
 | 
			
		||||
            return None
 | 
			
		||||
 | 
			
		||||
        if kind == 'tree':            
 | 
			
		||||
            return queue_records
 | 
			
		||||
 | 
			
		||||
        # simple queue records need splitting upload/download values
 | 
			
		||||
        splitted_queue_records = []
 | 
			
		||||
        for queue_record in queue_records:
 | 
			
		||||
            splitted_queue_record = {}
 | 
			
		||||
            for key, value in queue_record.items():
 | 
			
		||||
                split_values = value.split('/')
 | 
			
		||||
                if split_values and len(split_values) > 1:
 | 
			
		||||
                    splitted_queue_record[f'{key}_up'] = split_values[0]
 | 
			
		||||
                    splitted_queue_record[f'{key}_down'] = split_values[1]
 | 
			
		||||
                else:
 | 
			
		||||
                    splitted_queue_record[key] = value
 | 
			
		||||
            splitted_queue_records.append(splitted_queue_record)            
 | 
			
		||||
        return splitted_queue_records
 | 
			
		||||
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class SimpleQueueMetricsDataSource:
 | 
			
		||||
    ''' Simple Queue Metrics data provider
 | 
			
		||||
    '''             
 | 
			
		||||
    @staticmethod    
 | 
			
		||||
    def metric_records(router_entry, *, metric_labels = None):
 | 
			
		||||
        if metric_labels is None:
 | 
			
		||||
            metric_labels = []                
 | 
			
		||||
        try:
 | 
			
		||||
            simple_queue_records = router_entry.api_connection.router_api().get_resource('/queue/simple/').get()
 | 
			
		||||
            return BaseDSProcessor.trimmed_records(router_entry, router_records = simple_queue_records, metric_labels = metric_labels)
 | 
			
		||||
        except Exception as exc:
 | 
			
		||||
            print(f'Error getting system resource info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
 | 
			
		||||
            return None
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user