Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3059_fix_on_string

This commit is contained in:
Harrys Ravalomanana
2020-05-08 19:07:34 +04:00
7 changed files with 85 additions and 7 deletions

2
.gitignore vendored
View File

@@ -19,6 +19,8 @@
# Exclude configuration folder exception the configuration sample file # Exclude configuration folder exception the configuration sample file
/config /config
!/config/configuration.sample.yml !/config/configuration.sample.yml
!/config/filebeat.yml
!/config/logstash.conf
# Exclude generated proxies from doctrine2 # Exclude generated proxies from doctrine2
#/resources/proxies #/resources/proxies

10
config/filebeat.yml Normal file
View File

@@ -0,0 +1,10 @@
filebeat:
inputs:
- type: log
enabled: true
paths:
- /var/alchemy/Phraseanet/logs/task_*.log
- /var/alchemy/Phraseanet/logs/worker_service*.log
- /var/alchemy/Phraseanet/logs/app_error*.log
output.logstash:
hosts: ["logstash:5044"]

36
config/logstash.conf Normal file
View File

@@ -0,0 +1,36 @@
input {
beats {
port => 5044
}
}
filter {
clone {
clones => ["to_stdout"]
}
if [type] == "to_stdout" {
#display only message field in the logstash stdout
prune {
whitelist_names => ["message"]
}
mutate {
add_field => { "[@metadata][type]" => "to_stdout" }
}
}
else {
mutate {
add_field => { "[@metadata][type]" => "to_elasticsearch" }
}
}
}
output {
if [@metadata][type][1] == "to_stdout" {
stdout {
codec => rubydebug
}
}
else {
elasticsearch { hosts => ["elasticsearch:9200"] }
}
}

View File

@@ -91,6 +91,30 @@ services:
image: kibana:4.6.6 image: kibana:4.6.6
ports: ports:
- 5601:5601 - 5601:5601
links:
- elasticsearch
depends_on:
- elasticsearch
logstash:
image: logstash:7.6.2
links:
- elasticsearch
volumes:
- ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
command: logstash -f /var/alchemy/Phraseanet/config/logstash.conf
depends_on:
- elasticsearch
restart: on-failure
filebeat:
hostname: filebeat
image: "docker.elastic.co/beats/filebeat:7.6.2"
volumes:
- ${PHRASEANET_CONFIG_DIR}/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
- ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:ro
command: filebeat run -e --strict.perms=false
restart: on-failure
networks: networks:
default: default:

View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.195-d", "phraseanet-production-client": "0.34.196-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

View File

@@ -68,7 +68,13 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<video id="thumb_video" controls="" preload="auto" data-ratio="{{ prevRatio }}"> <video id="thumb_video_A" class="thumb_video fake-video" controls="" preload="auto" data-ratio="{{ prevRatio }}">
{% for subdef in previewHtml5 %}
<source type="{{ subdef.get_mime() }}" src="{{ subdef.get_url() }}"/>
{% endfor %}
{{ 'No preview available' | trans }}
</video>
<video id="thumb_video" class="thumb_video real-video" controls="" preload="auto" data-ratio="{{ prevRatio }}">
{% for subdef in previewHtml5 %} {% for subdef in previewHtml5 %}
<source type="{{ subdef.get_mime() }}" src="{{ subdef.get_url() }}"/> <source type="{{ subdef.get_mime() }}" src="{{ subdef.get_url() }}"/>
{% endfor %} {% endfor %}

View File

@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.195-d: phraseanet-production-client@0.34.196-d:
version "0.34.195-d" version "0.34.196-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.195-d.tgz#27faa60fd2e336fb8ac2e2da17d864b86e469314" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.196-d.tgz#ddd57e762cd10f42e95942fb631259566f85d5e6"
integrity sha512-zFsg21KtO52odU3PJPS+ZNQXoeJHxfRqMOyaid0B128cTOq/GqMCZwhtRPnyrR2TVPkALaU+E5iAUgbpkA0bNg== integrity sha512-qkgEEznndm/c4KQuBLyX4hF2xZLOnpKOf8Sfrd0j1+B7FmVbfXbVxht8jsijjRvISZWfPdEDqOELd3NwSK5drg==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"