mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #114309 from logicalhan/revert
Revert "expose prometheus.Registerer so that we can hook into this from external sources"
This commit is contained in:
		@@ -157,10 +157,6 @@ type KubeRegistry interface {
 | 
				
			|||||||
	Reset()
 | 
						Reset()
 | 
				
			||||||
	// RegisterMetaMetrics registers metrics about the number of registered metrics.
 | 
						// RegisterMetaMetrics registers metrics about the number of registered metrics.
 | 
				
			||||||
	RegisterMetaMetrics()
 | 
						RegisterMetaMetrics()
 | 
				
			||||||
	// Registerer exposes the underlying prometheus registerer
 | 
					 | 
				
			||||||
	Registerer() prometheus.Registerer
 | 
					 | 
				
			||||||
	// Gatherer exposes the underlying prometheus gatherer
 | 
					 | 
				
			||||||
	Gatherer() prometheus.Gatherer
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// kubeRegistry is a wrapper around a prometheus registry-type object. Upon initialization
 | 
					// kubeRegistry is a wrapper around a prometheus registry-type object. Upon initialization
 | 
				
			||||||
@@ -192,16 +188,6 @@ func (kr *kubeRegistry) Register(c Registerable) error {
 | 
				
			|||||||
	return nil
 | 
						return nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Registerer exposes the underlying prometheus.Registerer
 | 
					 | 
				
			||||||
func (kr *kubeRegistry) Registerer() prometheus.Registerer {
 | 
					 | 
				
			||||||
	return kr.PromRegistry
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
// Gatherer exposes the underlying prometheus.Gatherer
 | 
					 | 
				
			||||||
func (kr *kubeRegistry) Gatherer() prometheus.Gatherer {
 | 
					 | 
				
			||||||
	return kr.PromRegistry
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
// MustRegister works like Register but registers any number of
 | 
					// MustRegister works like Register but registers any number of
 | 
				
			||||||
// Collectors and panics upon the first registration that causes an
 | 
					// Collectors and panics upon the first registration that causes an
 | 
				
			||||||
// error.
 | 
					// error.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user