Update data for production taginfo

OpenHistoricalMap · Apr 15, 2024 · dc1ddb5 · dc1ddb5
1 parent c18b48f
commit dc1ddb5
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 7 deletions.
diff --git a/images/taginfo/taginfo-config-production.json b/images/taginfo/taginfo-config-production.json
@@ -1,6 +1,6 @@
 {
     "instance": {
-        "url": "https://staging.openhistoricalmap.org",
+        "url": "https://taginfo.openhistoricalmap.org",
         "name": "OpenHistoricalMap Taginfo",
         "description": "<b>taginfo instance</b>",
         "about": "<p>This site is maintained by openhistoricalmap.</p>",
@@ -10,17 +10,66 @@
         "access_control_allow_origin": "*",
         "sections": ["download", "taginfo"]
     },
+    "geodistribution": {
+        "left": -180,
+        "bottom": -90,
+        "right": 180,
+        "top": 90,
+        "width": 360,
+        "height": 180,
+        "scale_image": 2,
+        "scale_compare_image" : 1,
+        "background_image": "/img/mapbg/world.png",
+        "image_attribution": "osm-seed"
+    },
+    "paths": {
+        "data_dir": "/usr/src/app/data",
+        "download_dir": "/usr/src/app/taginfo/web/public/download",
+        "bin_dir": "/usr/src/app/taginfo-tools/build/src",
+        "sqlite3_pcre_extension": "/usr/lib/sqlite3/pcre.so"
+    },
+    "xapi": {
+        "max_results": 1000,
+        "url_prefix": "https://overpass-api.de/api/xapi_meta?"
+    },
     "turbo": {
         "max_auto": 1000,
-        "url_prefix": "https://openhistoricalmap.github.io/overpass-turbo/?",
+        "url_prefix": "https://overpass-turbo.openhistoricalmap.org?",
         "wizard_area": "global"
     },
+    "level0": {
+        "max_results": 50,
+        "overpass_url_prefix": "https://overpass-api.openhistoricalmap.org?",
+        "level0_url_prefix": "http://level0.osmz.ru/?"
+    },
+    "opensearch": {
+        "shortname": "Taginfo Instance",
+        "contact": "[email protected]",
+        "description": "Find metadata about OpenHistoricalMap tags",
+        "tags": "OHM OpenHistoricalMap tags taginfo"
+    },
     "sources": {
+        "download": "languages wiki wikidata",
+        "create": "db projects chronology",
+        "db": {
+            "planetfile": "/osm/planet/var/current-planet.osm.pbf",
+            "bindir": "/apps/data/update/build/src"
+        },
+        "chronology": {
+            "osm_history_file": "/osm/planet/var/current-history-planet.osh.pbf"
+        },
         "master": {
             "min_count_tags": 10,
             "min_tag_combination_count": 10,
             "min_count_for_map": 10,
             "min_count_relations_per_type": 10
         }
+    },
+    "logging": {
+        "directory": "/usr/src/app/logs",
+        "min_duration": 0.1
+    },
+    "tagstats": {
+        "geodistribution": "FlexMem"
     }
 }
diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
   - name: osm-seed
-    version: '0.1.0-n802.h9403df3'
+    version: '0.1.0-n803.h0b36dbb'
     repository: https://devseed.com/osm-seed-chart/
diff --git a/values.production.template.yaml b/values.production.template.yaml
@@ -626,15 +626,18 @@ osm-seed:
       service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
     ingressDomain: taginfo.openhistoricalmap.org
     env:
-      URL_PLANET_FILE_STATE: https://planet.openhistoricalmap.org.s3.amazonaws.com/planet/state.txt
-      URL_HISTORY_PLANET_FILE_STATE: https://planet.openhistoricalmap.org.s3.amazonaws.com/planet/full-history/state.txt
+      URL_PLANET_FILE_STATE: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/state.txt
+      URL_HISTORY_PLANET_FILE_STATE: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/full-history/state.txt
       URL_PLANET_FILE: 'none'
       URL_HISTORY_PLANET_FILE: 'none'
       TIME_UPDATE_INTERVAL: 7d
       OVERWRITE_CONFIG_URL: https://raw.githubusercontent.com/OpenHistoricalMap/ohm-deploy/main/images/taginfo/taginfo-config-production.json
       TAGINFO_PROJECT_REPO: https://github.com/OpenHistoricalMap/taginfo-projects.git
       DOWNLOAD_DB: 'languages wiki'
       CREATE_DB: 'db projects chronology'
+      ENVIRONMENT: staging
+      AWS_S3_BUCKET: taginfo
+      INTERVAL_DOWNLOAD_DATA: 86400
     resources:
       enabled: false
       requests:
@@ -647,6 +650,13 @@ osm-seed:
       enabled: true
       label_key: nodegroup_type
       label_value: web
+    cronjob:
+      enabled: true
+      schedule: "0 3 */7 * *" # 3:00 AM every 7 days
+      nodeSelector:
+        enabled: true
+        label_key: nodegroup_type
+        label_value: job 
 # ====================================================================================================
 # Variables for osm-simple-metrics
 # ====================================================================================================
@@ -665,6 +675,7 @@ osm-seed:
       enabled: true
       label_key: nodegroup_type
       label_value: job
+
   # ====================================================================================================
   # Variables for replication nomitoring task
   # ====================================================================================================

diff --git a/values.staging.template.yaml b/values.staging.template.yaml
@@ -672,7 +672,7 @@ osm-seed:
         CREATE_DB: 'db projects chronology'
         ENVIRONMENT: staging
         AWS_S3_BUCKET: taginfo
-        INTERVAL_DOWNLOAD_DATA: 3600
+        INTERVAL_DOWNLOAD_DATA: 86400
       resources:
         enabled: false
         requests:
@@ -687,7 +687,7 @@ osm-seed:
         label_value: web
       cronjob:
         enabled: true
-        schedule: "* * * * *"
+        schedule: "0 0 * * *" # every 1 days - testing
         nodeSelector:
           enabled: true
           label_key: nodegroup_type