Commit 0af99c56 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'feature-ChangeTimeSeriesIndexPattern' into 'dev' 

Feature change time series index pattern

See merge request redmic-project/server/time-series!11
parents 7c9fec33 6ed86deb

deploy/docker-compose.time-series-commands.dev.yml

+7 −6
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ services: 
  time-series-commands:

    environment:

      - JAVA_OPTS=-Xmx768m -Xms256m

    deploy:

        resources:

            limits:

              cpus: '1'

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	<groupId>es.redmic.time-series</groupId>

	<artifactId>time-series</artifactId>

	<packaging>pom</packaging>

	<version>0.4.0</version>

	<version>0.4.0-feature-ChangeTimeSeriesIndexPattern</version>

	<name>Time series</name>



	<properties>

time-series-commands/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>es.redmic.time-series</groupId>

		<artifactId>time-series</artifactId>

		<version>0.4.0</version>

		<version>0.4.0-feature-ChangeTimeSeriesIndexPattern</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>

time-series-lib/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<groupId>es.redmic.time-series</groupId>

		<artifactId>time-series</artifactId>

		<version>0.4.0</version>

		<version>0.4.0-feature-ChangeTimeSeriesIndexPattern</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>

time-series-view/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>es.redmic.time-series</groupId>

		<artifactId>time-series</artifactId>

		<version>0.4.0</version>

		<version>0.4.0-feature-ChangeTimeSeriesIndexPattern</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>
@@ -15,7 +15,7 @@ 
	<description>Time series view microservice</description>

	

	<properties>

		<redmic.elasticsearch-lib.version>0.9.0</redmic.elasticsearch-lib.version>

		<redmic.elasticsearch-lib.version>0.12.0</redmic.elasticsearch-lib.version>

		

		<!-- OTROS -->

		<elasticsearch.version>6.5.1</elasticsearch.version>