adds scroll menu, new panels

denesdata · Aug 4, 2020 · 7ca95cb · 7ca95cb
1 parent 919dfff
commit 7ca95cb
Show file tree

Hide file tree

Showing 57 changed files with 5,726 additions and 1,337 deletions.
diff --git a/.ipynb_checkpoints/docker-compose-checkpoint.yml b/.ipynb_checkpoints/docker-compose-checkpoint.yml
@@ -0,0 +1,147 @@
+version: "2.2"
+
+networks:
+  web:
+    external: true
+  internal:
+    external: false
+
+services:
+  traefik:
+    image: traefik:1.7.2-alpine
+    user: '0'
+    container_name: traefik
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - $PWD/traefik.toml:/traefik.toml
+      - $PWD/acme.json:/acme.json
+    ports:
+      - 80:80
+      - 443:443
+    labels:
+      - traefik.frontend.rule=Host:monitor.myserv.er
+      - traefik.port=8080
+    networks:
+      - web
+
+  grafana:
+    image: grafana/grafana:7.0.0
+    user: '0'
+    container_name: grafana
+    restart: always
+    volumes:
+      - ./grafana/var/lib/:/var/lib/grafana
+      - ./html/:/html
+    environment:
+      - GF_INSTALL_PLUGINS=grafana-clock-panel,yesoreyeram-boomtheme-panel,savantly-heatmap-panel,ryantxu-ajax-panel,grafana-worldmap-panel
+      - GF_SECURITY_ALLOW_EMBEDDING=true
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_SECURITY_COOKIE_SAMESITE=none
+      - GF_SECURITY_COOKIE_SECURE=true
+      - GF_RENDERING_SERVER_URL=http://renderer:8081/render
+      - GF_RENDERING_CALLBACK_URL=http://grafana:3000/
+      - GF_LOG_FILTERS=rendering:debug
+    labels:
+      - traefik.backend=grafana
+      - traefik.frontend.rule=Host:myserv.er
+      - traefik.docker.network=web
+      - traefik.port=3000
+    networks:
+      - internal
+      - web
+    depends_on:
+      - traefik
+    mem_limit: 128m
+    mem_reservation: 32m
+    cpus: 0.8
+    privileged: true
+
+  renderer:
+    image: grafana/grafana-image-renderer
+    user: '0'
+    container_name: renderer
+    restart: always
+    networks:
+      - internal
+    labels:
+      - traefik.enable=false
+    mem_limit: 400m
+    memswap_limit: 700m
+    cpus: 0.25
+    # privileged: true
+
+  influxdb:
+    image: influxdb
+    user: '0'
+    container_name: influxdb
+    restart: always
+    volumes:
+      - ./influxdb:/var/lib/influxdb
+    environment:
+      - INFLUXDB_ADMIN_USER=admin
+      - INFLUXDB_USER=user
+      - INFLUXDB_ADMIN_PASSWORD
+      - INFLUXDB_USER_PASSWORD
+      # - INFLUXDB_DATA_INDEX_VERSION=tsi1
+      - INFLUXDB_DATA_CACHE_MAX_MEMORY_SIZE=200m
+      - INFLUXDB_DATA_CACHE_SNAPSHOT_MEMORY_SIZE=10m
+      - INFLUXDB_DATA_WAL_FSYNC_DELAY=100ms
+      - INFLUXDB_DATA_COMPACT_FULL_WRITE_COLD_DURATION=48h
+      - INFLUXDB_COORDINATOR_WRITE_TIMEOUT=60s
+      - INFLUXDB_COORDINATOR_QUERY_TIMEOUT=30s
+      - INFLUXDB_RETENTION_ENABLED=false
+      - INFLUXDB_RETENTION_CHECK_INTERVAL=30000m
+      - INFLUXDB_SHARD_PRECREATION_CHECK_INTERVAL=24h
+    networks:    
+      - internal
+    labels:
+      - traefik.enable=false
+    mem_limit: 300m
+    memswap_limit: 600m
+    mem_reservation: 200m
+    cpus: 0.6
+    privileged: true
+
+  jupyter:
+    build: ./jupyter
+    user: '0'
+    container_name: jupyter
+    hostname: jupyter
+    restart: always
+    volumes:
+      - ./jupyter:/home/jovyan/work
+      - ./html:/home/jovyan/html
+    labels:
+      - traefik.backend=jupyter
+      - traefik.frontend.rule=Host:jupyter.myserv.er
+      - traefik.docker.network=web
+      - traefik.port=8888
+    networks:
+      - internal
+      - web
+    depends_on:
+      - traefik
+    mem_limit: 400m
+    mem_reservation: 100m
+    cpus: 0.9
+    privileged: true
+
+  httpd:
+    image: httpd
+    user: '0'
+    container_name: httpd
+    hostname: httpd     
+    restart: always
+    volumes:
+      - ./html:/usr/local/apache2/htdocs/    
+    labels:
+      - traefik.backend=httpd
+      - traefik.frontend.rule=Host:html.myserv.er
+      - traefik.docker.network=web
+      - traefik.port=80
+    networks:
+      - internal
+      - web
+    depends_on:
+      - traefik
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,21 +20,21 @@ services:
       - 80:80
       - 443:443
     labels:
-      - traefik.frontend.rule=Host:covid-monitor.csaladen.es
+      - traefik.frontend.rule=Host:monitor.myserv.er
       - traefik.port=8080
     networks:
       - web
 
   grafana:
-    image: grafana/grafana
+    image: grafana/grafana:7.0.0
     user: '0'
     container_name: grafana
     restart: always
     volumes:
       - ./grafana/var/lib/:/var/lib/grafana
       - ./html/:/html
     environment:
-      - GF_INSTALL_PLUGINS=grafana-clock-panel,yesoreyeram-boomtheme-panel,savantly-heatmap-panel,ryantxu-ajax-panel
+      - GF_INSTALL_PLUGINS=grafana-clock-panel,yesoreyeram-boomtheme-panel,savantly-heatmap-panel,ryantxu-ajax-panel,grafana-worldmap-panel
       - GF_SECURITY_ALLOW_EMBEDDING=true
       - GF_AUTH_ANONYMOUS_ENABLED=true
       - GF_SECURITY_COOKIE_SAMESITE=none
@@ -44,7 +44,7 @@ services:
       - GF_LOG_FILTERS=rendering:debug
     labels:
       - traefik.backend=grafana
-      - traefik.frontend.rule=Host:covid.csaladen.es
+      - traefik.frontend.rule=Host:myserv.er
       - traefik.docker.network=web
       - traefik.port=3000
     networks:
@@ -53,7 +53,7 @@ services:
     depends_on:
       - traefik
     mem_limit: 128m
-    mem_reservation: 64m
+    mem_reservation: 32m
     cpus: 0.8
     privileged: true
 
@@ -66,9 +66,10 @@ services:
       - internal
     labels:
       - traefik.enable=false
-    mem_limit: 512m
-    memswap_limit: 900m
-    cpus: 0.5
+    mem_limit: 400m
+    memswap_limit: 700m
+    cpus: 0.25
+    # privileged: true
 
   influxdb:
     image: influxdb
@@ -83,15 +84,23 @@ services:
       - INFLUXDB_ADMIN_PASSWORD
       - INFLUXDB_USER_PASSWORD
       # - INFLUXDB_DATA_INDEX_VERSION=tsi1
-      - INFLUXDB_DATA_CACHE_MAX_MEMORY_SIZE=500m
+      - INFLUXDB_DATA_CACHE_MAX_MEMORY_SIZE=200m
+      - INFLUXDB_DATA_CACHE_SNAPSHOT_MEMORY_SIZE=10m
+      - INFLUXDB_DATA_WAL_FSYNC_DELAY=100ms
+      - INFLUXDB_DATA_COMPACT_FULL_WRITE_COLD_DURATION=48h
+      - INFLUXDB_COORDINATOR_WRITE_TIMEOUT=60s
+      - INFLUXDB_COORDINATOR_QUERY_TIMEOUT=30s
+      - INFLUXDB_RETENTION_ENABLED=false
+      - INFLUXDB_RETENTION_CHECK_INTERVAL=30000m
+      - INFLUXDB_SHARD_PRECREATION_CHECK_INTERVAL=24h
     networks:    
       - internal
     labels:
       - traefik.enable=false
-    mem_limit: 512m
-    memswap_limit: 900m
-    mem_reservation: 256m
-    cpus: 0.5
+    mem_limit: 300m
+    memswap_limit: 600m
+    mem_reservation: 200m
+    cpus: 0.6
     privileged: true
 
   jupyter:
@@ -105,19 +114,18 @@ services:
       - ./html:/home/jovyan/html
     labels:
       - traefik.backend=jupyter
-      - traefik.frontend.rule=Host:covid-jupyter.csaladen.es
+      - traefik.frontend.rule=Host:jupyter.myserv.er
       - traefik.docker.network=web
       - traefik.port=8888
     networks:
       - internal
       - web
     depends_on:
       - traefik
-    mem_limit: 512m
-    memswap_limit: 1024m
-    mem_reservation: 128m
-    cpus: 0.5
-    # privileged: true
+    mem_limit: 400m
+    mem_reservation: 100m
+    cpus: 0.9
+    privileged: true
 
   httpd:
     image: httpd
@@ -129,11 +137,11 @@ services:
       - ./html:/usr/local/apache2/htdocs/    
     labels:
       - traefik.backend=httpd
-      - traefik.frontend.rule=Host:covid-html.csaladen.es
+      - traefik.frontend.rule=Host:html.myserv.er
       - traefik.docker.network=web
       - traefik.port=80
     networks:
       - internal
       - web
     depends_on:
-      - traefik
+      - traefik
diff --git a/html/panels/cases_counties.html b/html/panels/cases_counties.html
@@ -35,7 +35,7 @@
     var axlight='#52545c';
 
     // var colors = ['#1F60C4', '#C0D8FF', '#FFF899','#FFF899','#FFF899', '#E0B400', '#E0B400', '#E0B400', '#E0B400', '#E0B400', '#E0B400','#E0B400', '#E0B400','#E0B400', '#E0B400']
-    var colors = ['#C0D8FF','#FFF899','darkorange','crimson','crimson','crimson','crimson','crimson','crimson','crimson','crimson','darkred','darkred']
+    var colors = ['#C0D8FF','#FFF899','darkorange','crimson','crimson','crimson','crimson','crimson','crimson','darkred','darkred','darkred','darkred']
     var chart = new d3plus.Geomap()
         .data('county2_' + lang + '.json')
         .colorScale(value)