Commit b7d8ba90 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Añade config de volúmenes para producción

See merge request redmic-project/nifi!2
parents 14318605 0eb2f513

deploy/config/logback.xml

0 → 100644
+173 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

  Licensed to the Apache Software Foundation (ASF) under one or more

  contributor license agreements.  See the NOTICE file distributed with

  this work for additional information regarding copyright ownership.

  The ASF licenses this file to You under the Apache License, Version 2.0

  (the "License"); you may not use this file except in compliance with

  the License.  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->



<configuration scan="true" scanPeriod="30 seconds">

    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">

        <resetJUL>true</resetJUL>

    </contextListener>

    

    <appender name="APP_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

        <file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-app.log</file>

        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">

            <!--

              For daily rollover, use 'app_%d.log'.

              For hourly rollover, use 'app_%d{yyyy-MM-dd_HH}.log'.

              To GZIP rolled files, replace '.log' with '.log.gz'.

              To ZIP rolled files, replace '.log' with '.log.zip'.

            -->

            <fileNamePattern>${org.apache.nifi.bootstrap.config.log.dir}/nifi-app_%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>

            <maxFileSize>10MB</maxFileSize>

            <!-- keep 30 log files worth of history -->

            <maxHistory>2</maxHistory>

        </rollingPolicy>

        <immediateFlush>true</immediateFlush>

        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

            <pattern>%date %level [%thread] %logger{40} %msg%n</pattern>

        </encoder>

    </appender>

    

    <appender name="USER_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

        <file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-user.log</file>

        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

            <!--

              For daily rollover, use 'user_%d.log'.

              For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.

              To GZIP rolled files, replace '.log' with '.log.gz'.

              To ZIP rolled files, replace '.log' with '.log.zip'.

            -->

            <fileNamePattern>${org.apache.nifi.bootstrap.config.log.dir}/nifi-user_%d.log</fileNamePattern>

            <maxFileSize>10MB</maxFileSize>

            <!-- keep 30 log files worth of history -->

            <maxHistory>2</maxHistory>

        </rollingPolicy>

        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

            <pattern>%date %level [%thread] %logger{40} %msg%n</pattern>

        </encoder>

    </appender>



    <appender name="BOOTSTRAP_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

        <file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-bootstrap.log</file>

        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">

            <!--

              For daily rollover, use 'user_%d.log'.

              For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.

              To GZIP rolled files, replace '.log' with '.log.gz'.

              To ZIP rolled files, replace '.log' with '.log.zip'.

            -->

            <fileNamePattern>${org.apache.nifi.bootstrap.config.log.dir}/nifi-bootstrap_%d.log</fileNamePattern>

            <maxFileSize>10MB</maxFileSize>

            <!-- keep 5 log files worth of history -->

            <maxHistory>2</maxHistory>

        </rollingPolicy>

        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

            <pattern>%date %level [%thread] %logger{40} %msg%n</pattern>

        </encoder>

    </appender>

	

    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">

        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

            <pattern>%date %level [%thread] %logger{40} %msg%n</pattern>

        </encoder>

    </appender>

    

    <!-- valid logging levels: TRACE, DEBUG, INFO, WARN, ERROR -->

    

    <logger name="org.apache.nifi" level="WARN"/>

    <logger name="org.apache.nifi.processors" level="WARN"/>

    <logger name="org.apache.nifi.processors.standard.LogAttribute" level="WARN"/>

    <logger name="org.apache.nifi.processors.standard.LogMessage" level="WARN"/>

    <logger name="org.apache.nifi.controller.repository.StandardProcessSession" level="WARN" />

    

    

    <logger name="org.apache.zookeeper.ClientCnxn" level="ERROR" />

    <logger name="org.apache.zookeeper.server.NIOServerCnxn" level="ERROR" />

    <logger name="org.apache.zookeeper.server.NIOServerCnxnFactory" level="ERROR" />

    <logger name="org.apache.zookeeper.server.quorum" level="ERROR" />

    <logger name="org.apache.zookeeper.ZooKeeper" level="ERROR" />

    <logger name="org.apache.zookeeper.server.PrepRequestProcessor" level="ERROR" />



    <logger name="org.apache.calcite.runtime.CalciteException" level="OFF" />



    <logger name="org.apache.curator.framework.recipes.leader.LeaderSelector" level="OFF" />

    <logger name="org.apache.curator.ConnectionState" level="OFF" />

    

    <!-- Logger for managing logging statements for nifi clusters. -->

    <logger name="org.apache.nifi.cluster" level="WARN"/>



    <!-- Logger for logging HTTP requests received by the web server. -->

    <logger name="org.apache.nifi.server.JettyServer" level="WARN"/>



    <!-- Logger for managing logging statements for jetty -->

    <logger name="org.eclipse.jetty" level="WARN"/>



    <!-- Suppress non-error messages due to excessive logging by class or library -->

    <logger name="org.springframework" level="ERROR"/>

    

    <!-- Suppress non-error messages due to known warning about redundant path annotation (NIFI-574) -->

    <logger name="org.glassfish.jersey.internal.Errors" level="ERROR"/>



    <!-- Suppress non-error messages due to Jetty AnnotationParser emitting a large amount of WARNS. Issue described in NIFI-5479. -->

    <logger name="org.eclipse.jetty.annotations.AnnotationParser" level="ERROR"/>



    <!--

        Logger for capturing user events. We do not want to propagate these

        log events to the root logger. These messages are only sent to the

        user-log appender.

    -->

    <logger name="org.apache.nifi.web.security" level="WARN" additivity="false">

        <appender-ref ref="USER_FILE"/>

    </logger>

    <logger name="org.apache.nifi.web.api.config" level="WARN" additivity="false">

        <appender-ref ref="USER_FILE"/>

    </logger>

    <logger name="org.apache.nifi.authorization" level="WARN" additivity="false">

        <appender-ref ref="USER_FILE"/>

    </logger>

    <logger name="org.apache.nifi.cluster.authorization" level="WARN" additivity="false">

        <appender-ref ref="USER_FILE"/>

    </logger>

    <logger name="org.apache.nifi.web.filter.RequestLogger" level="WARN" additivity="false">

        <appender-ref ref="USER_FILE"/>

    </logger>





    <!--

        Logger for capturing Bootstrap logs and NiFi's standard error and standard out. 

    -->

    <logger name="org.apache.nifi.bootstrap" level="WARN" additivity="false">

        <appender-ref ref="BOOTSTRAP_FILE" />

    </logger>

    <logger name="org.apache.nifi.bootstrap.Command" level="WARN" additivity="false">

        <appender-ref ref="CONSOLE" />

        <appender-ref ref="BOOTSTRAP_FILE" />

    </logger>



    <!-- Everything written to NiFi's Standard Out will be logged with the logger org.apache.nifi.StdOut at INFO level -->

    <logger name="org.apache.nifi.StdOut" level="WARN" additivity="false">

        <appender-ref ref="BOOTSTRAP_FILE" />

    </logger>

    

    <!-- Everything written to NiFi's Standard Error will be logged with the logger org.apache.nifi.StdErr at ERROR level -->

    <logger name="org.apache.nifi.StdErr" level="ERROR" additivity="false">

        <appender-ref ref="BOOTSTRAP_FILE" />

    </logger>





    <root level="WARN">

        <appender-ref ref="APP_FILE"/>

    </root>

    

</configuration>

deploy/docker-compose.nifi.dev.yml

+17 −1
Original line number Diff line number Diff line 
version: '3.5'



volumes:

  nifi-conf-vol:

    name: ${NIFI_CONF_VOL_NAME:-nifi-conf-vol}



  nifi-database-vol:

    name: ${NIFI_DATABASE_VOL_NAME:-nifi-database-vol}



  nifi-flowfile-vol:

    name: ${NIFI_FLOWFILE_VOL_NAME:-nifi-flowfile-vol}



  nifi-content-vol:

    name: ${NIFI_CONTENT_VOL_NAME:-nifi-content-vol}



  nifi-provenance-vol:

    name: ${NIFI_PROVENANCE_VOL_NAME:-nifi-provenance-vol}

deploy/docker-compose.nifi.prod.yml

+40 −1
Original line number Diff line number Diff line
@@ -6,3 +6,42 @@ services: 
      placement:

        constraints:

          - node.role == worker



volumes:

  nifi-conf-vol:

    name: ${NIFI_CONF_VOL_NAME:-nifi-conf-vol}

    driver: "cloudstor:aws"

    driver_opts:

      backing: shared



  nifi-database-vol:

    name: ${NIFI_DATABASE_VOL_NAME:-nifi-database-vol}

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2



  nifi-flowfile-vol:

    name: ${NIFI_FLOWFILE_VOL_NAME:-nifi-flowfile-vol}

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2



  nifi-content-vol:

    name: ${NIFI_CONTENT_VOL_NAME:-nifi-content-vol}

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2



  nifi-provenance-vol:

    name: ${NIFI_PROVENANCE_VOL_NAME:-nifi-provenance-vol}

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2

deploy/docker-compose.nifi.tmpl.yml

+8 −15
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ services: 
      - nifi-content-vol:${NIFI_HOME}/content_repository

      - nifi-provenance-vol:${NIFI_HOME}/provenance_repository

      - nifi-state-vol:${NIFI_HOME}/state

    configs:

      - source: logback-xml

        target: ${NIFI_HOME}/conf/logback.xml

    healthcheck:

      test: curl --silent http://apache-nifi:${PORT}

      interval: 30s
@@ -56,20 +59,10 @@ volumes: 
  nifi-log-vol:

    name: ${NIFI_LOG_VOL_NAME:-nifi-log-vol}



  nifi-conf-vol:

    name: ${NIFI_CONF_VOL_NAME:-nifi-conf-vol}



  nifi-database-vol:

    name: ${NIFI_DATABASE_VOL_NAME:-nifi-database-vol}



  nifi-flowfile-vol:

    name: ${NIFI_FLOWFILE_VOL_NAME:-nifi-flowfile-vol}



  nifi-content-vol:

    name: ${NIFI_CONTENT_VOL_NAME:-nifi-content-vol}



  nifi-provenance-vol:

    name: ${NIFI_PROVENANCE_VOL_NAME:-nifi-provenance-vol}



  nifi-state-vol:

    name: ${NIFI_STATE_VOL_NAME:-nifi-state-vol}



configs:

  logback-xml:

    name: ${LOGBACK_XML_NAME:-nifi-logback-xml}

    file: ./config/logback.xml

src/activities/1284.json

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
		"upperTolerance": 1.0,

		"lowerTolerance": 1.0

	},

	"press_bar": {

	"press_mbar": {

		"dataDefinition": "16",

		"upperLimit": 1050.0,

		"lowerLimit": 950.0,
@@ -22,7 +22,7 @@ 
		"lowerTolerance": 0.0

	},

	"wind_dir_magnetic": {

		"dataDefinition": "9",

		"dataDefinition": "664",

		"upperLimit": 360.0,

		"lowerLimit": 0.0,

		"upperTolerance": 0.0,