소스 검색

Merge branch 'master' of https://gitlab.com/interlink-sa/flowdat3/modules/stats into stats_command#1

Jean Sumara Leopoldo 5 년 전
부모
커밋
645394ffb8
3개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      .gitlab-ci.yml
  2. 2 0
      src/StatsBundle/Command/GenerateCrontabCommand.php
  3. 5 0
      src/StatsBundle/Command/GenerateRemoteCrontabCommand.php

+ 1 - 1
.gitlab-ci.yml

@@ -13,7 +13,7 @@ build_branch:
       - pushes
       - branches
 
-image: docker:stable
+image: docker:19.03.8
 
 variables:
   CONTAINER_IMAGE: docker.infra.flowdat.com/fd3/stats

+ 2 - 0
src/StatsBundle/Command/GenerateCrontabCommand.php

@@ -106,6 +106,8 @@ class GenerateCrontabCommand extends ContainerAwareCommand
                 $data = $device->jsonExtraData();
                 $deviceId = $device->getDeviceId();
 
+                if($data['executeSnmp'] == 0) continue;
+
                 if (is_null($data['snmpCommunity']) || empty($data['snmpCommunity'])){
 		            continue;
 		        }   

+ 5 - 0
src/StatsBundle/Command/GenerateRemoteCrontabCommand.php

@@ -140,6 +140,11 @@ class GenerateRemoteCrontabCommand extends ContainerAwareCommand
                 $data = $device->jsonExtraData();
                 $deviceId = $device->getDeviceId();
 
+                if ($data['executeSnmp'] == 0){
+                    $content .= PHP_EOL . PHP_EOL . "# Device {$deviceId} skiped, executeSnmp is 0" . PHP_EOL;
+                    continue;
+                }
+
                 if (is_null($data['snmpCommunity']) || empty($data['snmpCommunity'])){
 		            $content .= PHP_EOL . PHP_EOL . "# Device(NAS) {$deviceId} skiped, snmpCommunity is null or empty" . PHP_EOL;
                     continue;