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

Expose prometheus metrics at ScaledJob like ScaledObject #4817

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
aaab59b
Support prometheus for scaledJob
yoongon Jul 22, 2023
0e565f2
Use predefined variable metricName
yoongon Jul 22, 2023
04262ba
Update CHANGELOG
yoongon Jul 24, 2023
8d52f9a
Use separate scaledJob prometheus counters
yoongon Jul 30, 2023
011aec6
Use switch case for scaledObject and scaledJob
yoongon Jul 30, 2023
fae57e6
Rename to contain scaledObject to differentiate
yoongon Jul 30, 2023
7ea2830
Update comment to explain the purpose of empty return line
yoongon Jul 30, 2023
edef80f
Rollback to original change
yoongon Aug 26, 2023
8ce4b0c
Use prometheus label to diffentiate scaledObject and scaledJob
yoongon Aug 26, 2023
69179a5
Use unused scaledJobErrors
yoongon Aug 26, 2023
9ab6b18
Security Update pr-e2e.yml (#4822)
aashish-19 Jul 26, 2023
8c961af
fix path for azure_queue_test.go (#4815)
Adarsh-verma-14 Jul 26, 2023
032351c
chore: Generate standalone CRDs manifests as part of release process …
atzawada Jul 26, 2023
9f88f00
chore: Update changelog and bug template with v2.11.2 (#4828)
JorTurFer Jul 27, 2023
424904e
fix(solr e2e): remove '-' from status command (#4835)
JorTurFer Aug 1, 2023
d112095
chore(deps): bump LouisBrunner/checks-action from 1.6.0 to 1.6.2 (#4839)
dependabot[bot] Aug 2, 2023
af4afaa
chore(deps): bump helm/kind-action from 1.7.0 to 1.8.0 (#4838)
dependabot[bot] Aug 2, 2023
39f15b2
Revert "chore(deps): bump helm/kind-action from 1.7.0 to 1.8.0" (#4856)
JorTurFer Aug 3, 2023
82f2fb6
Fix docker build error for go 1.20.5 version (#4877)
dttung2905 Aug 13, 2023
a933443
adding the script to validate changelog (#4731)
nitishchauhan0022 Aug 17, 2023
2963b3f
chore: Add testing documentation (#4884)
JorTurFer Aug 18, 2023
805242b
Deprecation cleanup for 2.12 release (#4806)
dttung2905 Aug 23, 2023
0e46478
Update (#4904)
SpiritZhou Aug 24, 2023
756ea4a
fix typo in log message (#4902)
drmorr0 Aug 24, 2023
35345ec
chore: KEDA v2.12 is targeted for September 26th, instead of 12th (#4…
tomkerkhove Aug 25, 2023
96e357e
Improve events of CRDs (#4829)
SpiritZhou Aug 25, 2023
e4b63bb
feat(aws-sqs): Support for scaling to include delayed messages (#4900)
phr3nzii Aug 25, 2023
3d39c52
chore: KEDA is a CNCF Graduated project (#4896)
tomkerkhove Aug 25, 2023
1e7c6b1
Update changelog
yoongon Aug 26, 2023
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
18 changes: 11 additions & 7 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

FROM golang:1.20.4
FROM golang:1.20.5

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -72,16 +72,20 @@ RUN apt-get update \
&& apt-get install -y sudo \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME \
# Docker install
&& apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
&& curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null \
&& add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
&& apt-get update \
# Docker install https://docs.docker.com/engine/install/debian/
&& sudo install -m 0755 -d /etc/apt/keyrings \
&& curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
&& sudo chmod a+r /etc/apt/keyrings/docker.gpg \
&& echo \
"deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
"$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null \
&& sudo apt-get update \
&& apt-get install -y docker-ce-cli \
#
# Install pip & pre-commit
&& apt-get -y install python3-pip \
&& python3 -m pip install --no-cache-dir pre-commit \
&& python3 -m pip install --no-cache-dir --break-system-packages pre-commit \
#
# Clean up
&& apt-get autoremove -y \
Expand Down
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/3_bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ body:
label: KEDA Version
description: What version of KEDA that are you running?
options:
- "2.11.2"
- "2.11.1"
- "2.11.0"
- "2.10.1"
Expand Down Expand Up @@ -88,6 +89,7 @@ body:
label: Kubernetes Version
description: What version of Kubernetes that are you running?
options:
- "1.27"
- "1.26"
- "1.25"
- "1.24"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-e2e-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: label checker
runs-on: ubuntu-latest
steps:
- uses: LouisBrunner/[email protected].0
- uses: LouisBrunner/[email protected].2
name: Enqueue e2e
id: create
with:
Expand All @@ -23,7 +23,7 @@ jobs:
name: ${{ env.E2E_CHECK_NAME }}
status: queued

- uses: LouisBrunner/[email protected].0
- uses: LouisBrunner/[email protected].2
name: Skip e2e
if: ${{ contains(github.event.pull_request.labels.*.name, env.SKIP_E2E_TAG )}}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-e2e-creator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: check-creator
runs-on: ubuntu-latest
steps:
- uses: LouisBrunner/[email protected].0
- uses: LouisBrunner/[email protected].2
name: Enqueue e2e
id: create
with:
Expand All @@ -23,7 +23,7 @@ jobs:
name: ${{ env.E2E_CHECK_NAME }}
status: queued

- uses: LouisBrunner/[email protected].0
- uses: LouisBrunner/[email protected].2
name: Skip e2e
if: ${{ contains(github.event.pull_request.labels.*.name, env.SKIP_E2E_TAG )}}
with:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/pr-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
if: needs.triage.outputs.run-e2e == 'true'
steps:
- name: Set status in-progress
uses: LouisBrunner/[email protected].0
uses: LouisBrunner/[email protected].2
with:
token: ${{ secrets.GITHUB_TOKEN }}
sha: ${{ needs.triage.outputs.commit_sha }}
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
if: needs.triage.outputs.run-e2e == 'true'
steps:
- name: Set status in-progress
uses: LouisBrunner/[email protected].0
uses: LouisBrunner/[email protected].2
with:
token: ${{ secrets.GITHUB_TOKEN }}
sha: ${{ needs.triage.outputs.commit_sha }}
Expand Down Expand Up @@ -155,8 +155,9 @@ jobs:
GCP_RUN_IDENTITY_TESTS: true
E2E_IMAGE_TAG: ${{ needs.triage.outputs.image_tag }}
TEST_CLUSTER_NAME: keda-e2e-cluster-pr
COMMENT_BODY: ${{ github.event.comment.body }}
run: |
MESSAGE="${{ github.event.comment.body }}"
MESSAGE="$COMMENT_BODY"
REGEX='/run-e2e (.+)'
if [[ "$MESSAGE" =~ $REGEX ]]
then
Expand Down Expand Up @@ -187,7 +188,7 @@ jobs:
reaction: "+1"

- name: Set status success
uses: LouisBrunner/[email protected].0
uses: LouisBrunner/[email protected].2
if: steps.test.outcome == 'success'
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -205,7 +206,7 @@ jobs:
reaction: "-1"

- name: Set status failure
uses: LouisBrunner/[email protected].0
uses: LouisBrunner/[email protected].2
if: steps.test.outcome != 'success'
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,15 @@ jobs:
asset_path: keda-${{ steps.get_version.outputs.VERSION }}-core.yaml
asset_name: keda-${{ steps.get_version.outputs.VERSION }}-core.yaml
asset_content_type: application/x-yaml

# Upload CRD deployment YAML file to GitHub release
- name: Upload Deployment YAML file
id: upload-crd-deployment-yaml
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/kedacore/keda/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-${{ steps.get_version.outputs.VERSION }}-crds.yaml
asset_path: keda-${{ steps.get_version.outputs.VERSION }}-crds.yaml
asset_name: keda-${{ steps.get_version.outputs.VERSION }}-crds.yaml
asset_content_type: application/x-yaml
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,8 @@ repos:
entry: golangci-lint run
types: [go]
pass_filenames: false
- id: validate-changelog
name: Validate Changelog
language: system
entry: "bash hack/validate-changelog.sh"
pass_filenames: false
Loading