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.

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

add another subpath level to values.yaml oap config override #142

Merged
merged 1 commit into from
Dec 4, 2023

Conversation

ScribblerCoder
Copy link
Contributor

@kezhenxu94's PR was a great enhancement that gave the ability to set oap config override files from within values.yaml. But it only allows us to override files that are up to 1 level deep under /skywalking/config.

For example:

  • alarm-settings.yaml is directly under /skywalking/config which is 0 levels deep
  • core.oal is under /skywalking/config/oal/ which is 1 level deep

Why this PR?
SkyWalking has some configuration files like:

  • /skywalking/config/ui-initialized-templates/general/*
  • /skywalking/config/openapi-definitions/serviceA/*
    Which are 2 levels deep and we need to have the ability to set them through values.yaml. So I just added one more level and now we can set override oap configurations this way

2 levels

    ui-initialized-templates:
      general:
        general-service.json: |
          [{"id":"General-Service" ........

1 level

     oal:
       core.oal: |
         service_resp_time = from(Service.latency).longAvg();
         service_sla = from(Service.*).percent(status == true);
         service_cpm = from(Service.*).cpm(); 
         ................

0 levels

    alarm-settings.yml: |
      rules:
        service_resp_time_rule:
          expression: sum(service_ .....
          .........

@wu-sheng wu-sheng added this to the 4.6.0 milestone Dec 3, 2023
@wu-sheng wu-sheng added the enhancement New feature or request label Dec 3, 2023
Copy link
Member

@kezhenxu94 kezhenxu94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks good.

@kezhenxu94 kezhenxu94 merged commit dac1606 into apache:master Dec 4, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
3 participants