Skip to content

Commit

Permalink
Merge pull request #851 from gitnnolabs/fix_metadata_aoi
Browse files Browse the repository at this point in the history
Ajusta o language, source, publisher e format para o template do OAI.
  • Loading branch information
gitnnolabs authored Aug 21, 2024
2 parents c9e09f3 + 1951a1c commit 9e28a45
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 95 deletions.
26 changes: 19 additions & 7 deletions article/templates/search/indexes/article/article_compile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,9 @@
</element>
<element name="language">
<element name="none">
<element name="none">
<element name="none">
{% for lang in object.languages.all %}
<field name="value">{{ lang }}</field>
{% endfor %}
</element>
</element>
{% for lang in object.languages.all %}
<field name="value">{{ lang.code2 }}</field>
{% endfor %}
</element>
</element>
<element name="rights">
Expand All @@ -85,6 +81,22 @@
{% endfor %}
</element>
</element>
<element name="source">
<element name="none">
<field name="value">{{ object.source }}</field>
</element>
</element>

<element name="publisher">
<element name="none">
<field name="value">{{ object.publisher.institution.institution_identification.name }}</field>
</element>
</element>
<element name="format">
<element name="none">
<field name="value">text/html</field>
</element>
</element>
</element>
<element name="bundles"/>
<element name="others">
Expand Down
88 changes: 0 additions & 88 deletions local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,91 +112,3 @@ services:
ports:
- "5559:5555"
command: /start-flower

# logstash:
# container_name: scielo_core_local_logstash
# build:
# context: ./docker_compose_dashboard/logstash/
# dockerfile: Dockerfile
# restart: always
# depends_on:
# - elasticsearch
# volumes:
# - ./logs:/logs:ro

# elasticsearch:
# image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0
# container_name: scielo_core_local_elasticsearch
# restart: always
# environment:
# - discovery.type=single-node
# - http.host=0.0.0.0
# - xpack.security.enabled=false
# - ES_JAVA_OPTS=-Xms750m -Xmx750m
# volumes:
# - elasticsearch_volume:/usr/share/elasticsearch/data
# ports:
# - 9200:9200

# kibana:
# # image: docker.elastic.co/kibana/kibana:8.14.0
# container_name: scielo_core_local_kibana
# build:
# context: ./docker_compose_dashboard/kibana/
# dockerfile: Dockerfile
# restart: always
# ports:
# - 5601:5601
# depends_on:
# - elasticsearch

prometheus:
image: prom/prometheus:latest
restart: always
ports:
- "9090:9090"
command:
- '--config.file=/etc/prometheus/prometheus.yml'
- '--web.enable-lifecycle'
volumes:
- ./monitoring_stack/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
# - ./monitoring_stack/prometheus/django.rules:/etc/prometheus/django.rules
- prometheus_data:/var/lib/grafana

grafana:
# image: grafana/grafana:latest
build:
context: ./monitoring_stack/grafana/
dockerfile: Dockerfile
restart: always
depends_on:
- prometheus
ports:
- "3000:3000"
env_file:
- ./.envs/.local/.dashboard
volumes:
- grafana_data:/var/lib/grafana

celery-exporter:
image: danihodovic/celery-exporter
restart: always
ports:
- 9808:9808
command: ["--broker-url=redis://redis:6379/0"]
depends_on:
- redis

victoriametrics:
image: victoriametrics/victoria-metrics
restart: always
ports:
- 8428:8428
depends_on:
- prometheus

volumes:
elasticsearch_volume:
static_volume:
grafana_data:
prometheus_data:

0 comments on commit 9e28a45

Please sign in to comment.