Skip to content

Commit

Permalink
add prometheus integration.
Browse files Browse the repository at this point in the history
  • Loading branch information
JaredTan95 authored and nobodyiam committed Aug 12, 2019
1 parent fd231ab commit dce5116
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
10 changes: 10 additions & 0 deletions apollo-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,15 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>

<!-- Micrometer core dependecy -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
package com.ctrip.framework.apollo.common.controller;

import java.util.List;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.server.MimeMappings;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
import org.springframework.http.MediaType;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import java.util.List;

@Configuration
public class WebMvcConfig implements WebMvcConfigurer, WebServerFactoryCustomizer<TomcatServletWebServerFactory> {

Expand All @@ -29,7 +27,6 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentRes
@Override
public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
configurer.favorPathExtension(false);
configurer.ignoreAcceptHeader(true).defaultContentType(MediaType.APPLICATION_JSON_UTF8);
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions apollo-common/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ server.max-http-header-size=10240
management.endpoints.web.base-path=/
logging.file.max-size=50MB
logging.file.max-history=10

management.endpoints.web.exposure.include=info,health,metrics,prometheus
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ protected void configure(HttpSecurity http) throws Exception {
http.csrf().disable();
http.headers().frameOptions().sameOrigin();
http.authorizeRequests()
.antMatchers("/openapi/**", "/vendor/**", "/styles/**", "/scripts/**", "/views/**", "/img/**").permitAll()
.antMatchers("/prometheus/**","/metrics/**","/openapi/**", "/vendor/**", "/styles/**", "/scripts/**", "/views/**", "/img/**").permitAll()
.antMatchers("/**").hasAnyRole(USER_ROLE);
http.formLogin().loginPage("/signin").permitAll().failureUrl("/signin?#/error").and().httpBasic();
SimpleUrlLogoutSuccessHandler urlLogoutHandler = new SimpleUrlLogoutSuccessHandler();
Expand Down
2 changes: 1 addition & 1 deletion apollo-portal/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ logging:
management:
health:
status:
order: DOWN, OUT_OF_SERVICE, UNKNOWN, UP
order: DOWN, OUT_OF_SERVICE, UNKNOWN, UP


0 comments on commit dce5116

Please sign in to comment.