Skip to content

Commit

Permalink
Remove any reference to Kibana and ElasticSearch support
Browse files Browse the repository at this point in the history
* Remove specific logging
* Remove scheduled export task
* Remove classes used only for Kibana export
  • Loading branch information
spoonman01 committed Sep 27, 2024
1 parent 5977cc7 commit b9cd155
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 698 deletions.
31 changes: 0 additions & 31 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ services:
- DB_PASSWORD=hold
depends_on:
- db
- elasticsearch
- kibana
- filebeat

db:
image: postgres:13
Expand All @@ -36,33 +33,5 @@ services:
volumes:
- hold-db:/var/lib/postgresql/data/

elasticsearch:
container_name: lh-elasticsearch
image: docker.elastic.co/elasticsearch/elasticsearch:7.11.0
environment:
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
- "discovery.type=single-node"
ports:
- 9200:9200

kibana:
container_name: lh-kibana
image: docker.elastic.co/kibana/kibana:7.11.0
environment:
- ELASTICSEARCH_HOSTS=http://elasticsearch:9200
- ELASTICSEARCH_URL=http://elasticsearch:9200
depends_on:
- elasticsearch
ports:
- 5601:5601

filebeat:
image: "docker.elastic.co/beats/filebeat:7.2.0"
user: root
volumes:
- ./filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
- /var/lib/docker:/var/lib/docker:ro
- /var/run/docker.sock:/var/run/docker.sock

volumes:
hold-db:
21 changes: 0 additions & 21 deletions filebeat.yml

This file was deleted.

6 changes: 3 additions & 3 deletions hold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ apiHost: ${WIRE_API_HOST:-https://prod-nginz-https.wire.com}

database:
driverClass: ${DB_DRIVER:-org.postgresql.Driver}
url: ${DB_URL:-jdbc:postgresql://localhost/legalhold}
user: ${DB_USER:-}
password: ${DB_PASSWORD:-}
url: ${DB_URL:-jdbc:postgresql://localhost/hold}
user: ${DB_USER:-hold}
password: ${DB_PASSWORD:-hold}
10 changes: 7 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,18 @@
<openhtml.version>1.0.10</openhtml.version>
<prometheus.version>0.16.0</prometheus.version>
<helium.version>1.3.0</helium.version>
<maven.test.skip>true</maven.test.skip>
</properties>

<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>
<dependencies>
<dependency>
Expand Down Expand Up @@ -74,7 +78,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.23.jre7</version>
<version>42.7.3</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
Expand All @@ -90,7 +94,7 @@
<dependency>
<groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId>
<version>0.9.10</version>
<version>0.9.11</version>
</dependency>
<dependency>
<groupId>com.openhtmltopdf</groupId>
Expand Down
15 changes: 0 additions & 15 deletions src/main/java/com/wire/bots/hold/DAO/EventsDAO.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,6 @@ int insert(@Bind("eventId") UUID eventId,
@RegisterColumnMapper(_EventsResultSetMapper.class)
List<Event> listConversations();

@SqlQuery("SELECT DISTINCT conversationId, time FROM Events WHERE exported = 'FALSE'")
@RegisterColumnMapper(_EventsResultSetMapper.class)
List<Event> getUnexportedConvs();

@SqlQuery("SELECT * FROM Events WHERE conversationId = :conversationId AND exported = 'FALSE' ORDER BY time ASC")
@RegisterColumnMapper(EventsResultSetMapper.class)
List<Event> listAllUnxported(@Bind("conversationId") UUID conversationId);

@SqlQuery("SELECT * FROM Events WHERE exported = 'FALSE' LIMIT 1000")
@RegisterColumnMapper(EventsResultSetMapper.class)
List<Event> listAllUnxported();

@SqlUpdate("UPDATE Events SET exported = 'TRUE' WHERE eventId = :eventId")
int markExported(@Bind("eventId") UUID eventId);

@SqlUpdate("DELETE FROM Events WHERE eventId = :eventId")
int delete(@Bind("eventId") UUID eventId);

Expand Down
186 changes: 0 additions & 186 deletions src/main/java/com/wire/bots/hold/KibanaExporter.java

This file was deleted.

Loading

0 comments on commit b9cd155

Please sign in to comment.