Merge pull request #15775 from ryantxu/rename-interpolate

use replaceVariables rather than onInterpolate

packages/grafana-ui/src/types/panel.ts

@@ -12,7 +12,7 @@ export interface PanelProps<T = any> {
   renderCounter: number;
   renderCounter: number;
   width: number;
   width: number;
   height: number;
   height: number;
-  onInterpolate: InterpolateFunction;
+  replaceVariables: InterpolateFunction;
 }
 }
 
 
 export interface PanelData {
 export interface PanelData {

public/app/features/dashboard/dashgrid/PanelChrome.tsx

@@ -85,7 +85,7 @@ export class PanelChrome extends PureComponent<Props, State> {
     });
     });
   };
   };
 
 
-  onInterpolate = (value: string, format?: string) => {
+  replaceVariables = (value: string, format?: string) => {
     return templateSrv.replace(value, this.props.panel.scopedVars, format);
     return templateSrv.replace(value, this.props.panel.scopedVars, format);
   };
   };
 
 
@@ -158,7 +158,7 @@ export class PanelChrome extends PureComponent<Props, State> {
           width={width - 2 * variables.panelhorizontalpadding}
           width={width - 2 * variables.panelhorizontalpadding}
           height={height - PANEL_HEADER_HEIGHT - variables.panelverticalpadding}
           height={height - PANEL_HEADER_HEIGHT - variables.panelverticalpadding}
           renderCounter={renderCounter}
           renderCounter={renderCounter}
-          onInterpolate={this.onInterpolate}
+          replaceVariables={this.replaceVariables}
         />
         />
       </div>
       </div>
     );
     );

public/app/plugins/panel/gauge/GaugePanel.tsx

@@ -15,11 +15,11 @@ interface Props extends PanelProps<GaugeOptions> {}
 
 
 export class GaugePanel extends PureComponent<Props> {
 export class GaugePanel extends PureComponent<Props> {
   render() {
   render() {
-    const { panelData, width, height, onInterpolate, options } = this.props;
+    const { panelData, width, height, replaceVariables, options } = this.props;
     const { valueOptions } = options;
     const { valueOptions } = options;
 
 
-    const prefix = onInterpolate(valueOptions.prefix);
-    const suffix = onInterpolate(valueOptions.suffix);
+    const prefix = replaceVariables(valueOptions.prefix);
+    const suffix = replaceVariables(valueOptions.suffix);
     let value: TimeSeriesValue;
     let value: TimeSeriesValue;
 
 
     if (panelData.timeSeries) {
     if (panelData.timeSeries) {