diff --git a/etc/grafana/resources/datasources/datasources.json b/etc/grafana/resources/datasources/datasources.json index 5fcc567..1bfa4c2 100644 --- a/etc/grafana/resources/datasources/datasources.json +++ b/etc/grafana/resources/datasources/datasources.json @@ -8,7 +8,7 @@ "typeName": "MySQL", "typeLogoUrl": "public/app/plugins/datasource/mysql/img/mysql_logo.svg", "access": "proxy", - "url": "__OGCORE_IP__:3336", + "url": "__OGCORE_IP__:3306", "user": "root", "password": "root", "database": "ogcore", diff --git a/etc/journalbeat/journalbeat.yml b/etc/journalbeat/journalbeat.yml index 7ddc048..ef2575e 100644 --- a/etc/journalbeat/journalbeat.yml +++ b/etc/journalbeat/journalbeat.yml @@ -11,6 +11,7 @@ output.elasticsearch: hosts: ["https://oglog-os.${SUBDOMAIN}:9200"] username: "admin" password: "${OPENSEARCH_INITIAL_ADMIN_PASSWORD}" + pipeline: "master_pipeline" protocol: "https" ssl.enabled: true ssl.verification_mode: full diff --git a/etc/opensearch/pipelines.json b/etc/opensearch/pipelines.json index 6f89c91..9060c22 100644 --- a/etc/opensearch/pipelines.json +++ b/etc/opensearch/pipelines.json @@ -129,6 +129,14 @@ "if" : "ctx.syslog?.identifier == 'docker'" } }, + { + "json": { + "field": "message", + "target_field": "parsed_message", + "ignore_failure": true, + "if": "ctx.syslog?.identifier == 'ogcore'" + } + }, { "set" : { "field" : "debug", diff --git a/script/oglog_installer.sh b/script/oglog_installer.sh index 60cc8c9..da0377c 100755 --- a/script/oglog_installer.sh +++ b/script/oglog_installer.sh @@ -349,7 +349,7 @@ while IFS= read -r line; do log "$line" done < <(./import_grafana.sh "https://oglog-graf.${SUBDOMAIN}:3000") - +systemctl restart grafana-server DURATION=$SECONDS