Removing Logentries from Runkeeper servers

.gitignore

@@ -10,12 +10,4 @@ data/secrets*.yaml
 data/*.sql
 puppet-rk_tomcat.iml
 rk_tomcat.iml
-.idea/.name
-.idea/compiler.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/vcs.xml
-.idea/workspace.xml
-.idea/copyright/profiles_settings.xml
-.idea/inspectionProfiles/Project_Default.xml
-.idea/inspectionProfiles/profiles_settings.xml
+.idea

manifests/deploy.pp

@@ -7,7 +7,6 @@
   $cloudant_host,
   $cloudant_user,
   $cloudant_password,
-  $logentries_tokens,
   $logdna_tokens,
   $newrelic_enabled,
   $redis_pushnotif_host,
@@ -77,10 +76,6 @@
     }
   }
 
-  # Logentries
-  $logentries_analytics_token = $logentries_tokens['analytics']
-  $logentries_applogs_token = $logentries_tokens['applogs']
-
   # LogDNA
   $logdna_applogs_token = $logdna_tokens['applogs']
 

templates/logbackInclude.xml.erb

@@ -37,10 +37,8 @@
    <property name="logdnaPattern" value="[%thread] %logger{0} -- %m%n%rEx{full,${ignoredStackTrace}}" />
 
 <%- if @tier == "staging" -%>
-   <property name="logentriesPattern" value="%cn <%= @staging_instance %> ${logPattern}" />
    <property name="logdnaEnv" value="<%= @staging_instance %>" />
 <%- else -%>
-   <property name="logentriesPattern" value="%cn ${logPattern}" />
    <property name="logdnaEnv" value="prod" />
 <%- end -%>
 
@@ -100,51 +98,6 @@
       </rollingPolicy>
    </appender>
 
-   <appender name="ANALYTICS_LOGENTRIES" class="com.logentries.logback.LogentriesAppender">
-       <Debug>False</Debug>
-       <Token><%= @logentries_analytics_token %></Token>
-       <Ssl>False</Ssl>
-       <facility>USER</facility>
-       <layout>
-          <pattern><%= @log_identifier %> %cn: %msg%n</pattern>
-       </layout>
-   </appender>
-
-   <appender name="APPLOGS_LOGENTRIES" class="com.logentries.logback.LogentriesAppender">
-<%- if (@tier == "production" && ! @artifacts.keys.include?("admin")) -%>
-       <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-          <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
-             <expression>try { Class.forName("fitnesskeeper.core.logging.InternalUsersFilter"); return true;  } catch (Exception ex) { return false; }</expression>
-          </evaluator>
-          <OnMatch>NEUTRAL</OnMatch>
-          <OnMismatch>DENY</OnMismatch>
-       </filter>
-       <filter class="ch.qos.logback.classic.filter.LevelFilter">
-          <level>INFO</level>
-          <onMatch>ACCEPT</onMatch>
-          <onMismatch>NEUTRAL</onMismatch>
-       </filter>
-       <filter class="ch.qos.logback.classic.filter.LevelFilter">
-          <level>WARN</level>
-          <onMatch>ACCEPT</onMatch>
-          <onMismatch>NEUTRAL</onMismatch>
-       </filter>
-       <filter class="ch.qos.logback.classic.filter.LevelFilter">
-          <level>ERROR</level>
-          <onMatch>ACCEPT</onMatch>
-          <onMismatch>NEUTRAL</onMismatch>
-       </filter>
-       <filter class="fitnesskeeper.core.logging.InternalUsersFilter" />
-<%- end -%>
-       <Debug>False</Debug>
-       <Token><%= @logentries_applogs_token %></Token>
-       <Ssl>False</Ssl>
-       <facility>USER</facility>
-       <layout>
-          <pattern>${logentriesPattern}</pattern>
-       </layout>
-   </appender>
-
    <appender name="APPLOGS_LOGDNA-HTTP" class="net._95point2.utils.LogDNAAppender">
 <%- if (@tier == "production" && ! @artifacts.keys.include?("admin")) -%>
        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
@@ -205,7 +158,6 @@
       <appender-ref ref="${appLogAppenderRef}" />
 
 <%- if @tier != "loadtest" -%>
-      <appender-ref ref="APPLOGS_LOGENTRIES" />
       <appender-ref ref="APPLOGS_LOGDNA" />
       <appender-ref ref="ERRORS_ANALYTICS" />
 <%- end -%>
@@ -236,22 +188,11 @@
    <!-- Note that additivity is set to false here -->
    <!-- this is important because it stops analytics logs from going to appenders in the root logger -->
    <logger name="analytics" additivity="false" level="INFO">
-
 <%- if @tier != "loadtest" -%>
       <appender-ref ref="ANALYTICS_FILE" />
 <%- end -%>
-
-<%- if @tier == "staging" -%>
-      <appender-ref ref="ANALYTICS_LOGENTRIES"/>
-<%- end -%>
    </logger>
 
-<%- if @tier == "production" -%>
-   <logger name="analytics-trace" additivity="false" level="TRACE">
-      <appender-ref ref="ANALYTICS_LOGENTRIES" />
-   </logger>
-<%- end -%>
-
   <logger name="analytics-engineering" additivity="false" level="INFO">
       <appender-ref ref="ANALYTICS_ENGINEERING_FILE" />
   </logger>