From e291e5caf86a5ff5a8cb91071582741bc82462e6 Mon Sep 17 00:00:00 2001
From: Rajesh Rajendran <rjshrjndrn@gmail.com>
Date: Thu, 27 Feb 2020 15:49:07 +0530
Subject: [PATCH] Removing depricated nginx scrape configs
removed logstash
removed logspout
---
.../stack-monitor/templates/stack-monitor.yml | 47 -------------------
.../templates/statsd_mapping.yml | 6 ---
2 files changed, 53 deletions(-)
diff --git a/ansible/roles/stack-monitor/templates/stack-monitor.yml b/ansible/roles/stack-monitor/templates/stack-monitor.yml
index c5976ccfe..af6974982 100644
--- a/ansible/roles/stack-monitor/templates/stack-monitor.yml
+++ b/ansible/roles/stack-monitor/templates/stack-monitor.yml
@@ -128,49 +128,6 @@ services:
limits:
memory: "{{ jsonpath_exporter_limit_memory }}"
- logstash:
- image: sunbird/logstash:2.4.1
- command: logstash -f /conf/logstash.conf
- environment:
- - LOGSPOUT=ignore
- - LS_HEAP_SIZE={{ monitor_logstash_heap_size }}
- configs:
- - source: monitor_logstash.conf
- target: /conf/logstash.conf
- - source: monitor_logstash_grok_patterns
- target: /conf/grok_patterns
- ports:
- - '51416:51415'
- - '5045:5044'
- networks:
- - application_default
- deploy:
- replicas: {{ monitor_logstash_replicas }}
- resources:
- reservations:
- memory: "{{ monitor_logstash_reservation_memory }}"
- limits:
- memory: "{{ monitor_logstash_limit_memory }}"
-
- logspout:
- image: gliderlabs/logspout:v3.2.3
- command: syslog+tcp://monitor_logstash:51415?filter.name=*_proxy.*
- deploy:
- mode: global
- resources:
- reservations:
- memory: "{{ monitor_logspout_reservation_memory }}"
- limits:
- memory: "{{ monitor_logspout_limit_memory }}"
- environment:
- - SYSLOG_FORMAT=rfc3164
- depends_on:
- - monitor_logstash
- volumes:
- - '/var/run/docker.sock:/tmp/docker.sock'
- networks:
- - application_default
-
configs:
prometheus.yml:
external: true
@@ -188,10 +145,6 @@ configs:
external: true
kong_cluster_exporter_config.yml:
external: true
- monitor_logstash.conf:
- external: true
- monitor_logstash_grok_patterns:
- external: true
networks:
application_default:
diff --git a/ansible/roles/stack-monitor/templates/statsd_mapping.yml b/ansible/roles/stack-monitor/templates/statsd_mapping.yml
index 31fd6693f..e03f9eac9 100644
--- a/ansible/roles/stack-monitor/templates/statsd_mapping.yml
+++ b/ansible/roles/stack-monitor/templates/statsd_mapping.yml
@@ -24,9 +24,3 @@ mappings:
name: "kong_response_size"
labels:
api: "$1"
-- match: nginx.log.statuscode.*
- name: "nginx_request_status_count"
- labels:
- status_code: $1
-- match: nginx.log.responsetime
- name: "nginx_response_time"
--
GitLab