Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(redis): JedisPool metrics (numActive, numIdle, numWaiters) #2681

Merged
merged 1 commit into from
Jun 1, 2018
Merged

chore(redis): JedisPool metrics (numActive, numIdle, numWaiters) #2681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...redis/src/main/java/com/netflix/spinnaker/cats/redis/cluster/ClusteredAgentScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ private void agentCompleted(String agentType, long nextExecutionTime) {
public void schedule(Agent agent,
AgentExecution agentExecution,
ExecutionInstrumentation executionInstrumentation) {
if (!enabledAgentPattern.matcher(agent.getClass().getSimpleName().toLowerCase()).matches()) {
if (!enabledAgentPattern.matcher(agent.getAgentType().toLowerCase()).matches()) {
logger.debug(
"Agent is not enabled (agent: {}, agentType: {}, pattern: {})",
agent.getClass().getSimpleName(),
Expand Down
16 changes: 15 additions & 1 deletion clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/core/RedisConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,21 @@ class RedisConfig {
JedisPool jedisPool(Registry registry,
RedisConfigurationProperties redisConfigurationProperties,
GenericObjectPoolConfig redisPoolConfig) {
return createPool(registry, redisPoolConfig, redisConfigurationProperties.connection, redisConfigurationProperties.timeout, "primaryDefault")
def jedisPool = createPool(
registry,
redisPoolConfig,
redisConfigurationProperties.connection,
redisConfigurationProperties.timeout,
"primaryDefault"
)

registry.gauge("jedis.pool.maxIdle", jedisPool, { JedisPool p -> return p.internalPool.maxIdle as Double })
registry.gauge("jedis.pool.minIdle", jedisPool, { JedisPool p -> return p.internalPool.minIdle as Double })
registry.gauge("jedis.pool.numActive", jedisPool, { JedisPool p -> return p.internalPool.numActive as Double })
registry.gauge("jedis.pool.numIdle", jedisPool, { JedisPool p -> return p.internalPool.numIdle as Double })
registry.gauge("jedis.pool.numWaiters", jedisPool, { JedisPool p -> return p.internalPool.numWaiters as Double })

return jedisPool
}

private static JedisPool createPool(Registry registry,
Expand Down