diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..a5157f5 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,12 @@ +**/*.yml +**/*.yaml +**/*.md +**/*example +**/Dockerfile* +Rakefile +Vagrantfile +coverage +docs +examples +scripts +vendor diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4ae585a..e9298f4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,9 +5,8 @@ updates: schedule: interval: weekly open-pull-requests-limit: 10 - -- package-ecosystem: github-actions - directory: "/" +- package-ecosystem: bundler + directory: "/docker/" schedule: interval: weekly open-pull-requests-limit: 10 diff --git a/.github/workflows/auto_release_prep.yml b/.github/workflows/auto_release_prep.yml deleted file mode 100644 index 57a12de..0000000 --- a/.github/workflows/auto_release_prep.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Automated release prep - -on: - workflow_dispatch: - -jobs: - auto_release_prep: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1 - secrets: inherit - with: - project-type: ruby - version-file-path: lib/vmpooler/version.rb diff --git a/.github/workflows/dependabot_merge.yml b/.github/workflows/dependabot_merge.yml deleted file mode 100644 index 75b9cea..0000000 --- a/.github/workflows/dependabot_merge.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Dependabot auto-merge - -on: pull_request - -jobs: - dependabot_merge: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/dependabot_merge.yml@v1 - secrets: inherit diff --git a/.github/workflows/ensure_label.yml b/.github/workflows/ensure_label.yml deleted file mode 100644 index 50a5fa8..0000000 --- a/.github/workflows/ensure_label.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Ensure label - -on: pull_request - -jobs: - ensure_label: - uses: puppetlabs/release-engineering-repo-standards/.github/workflows/ensure_label.yml@v1 - secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d020d40..6989bdb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'puppetlabs/vmpooler' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Get Current Version - uses: actions/github-script@v7 + uses: actions/github-script@v6 id: cv with: script: | @@ -29,6 +29,37 @@ jobs: echo "version=$version" >> $GITHUB_OUTPUT echo "Found version $version from lib/vmpooler/version.rb" + - name: Generate Changelog + uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2 + with: + args: >- + --future-release ${{ steps.nv.outputs.version }} + env: + CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Validate Changelog + run : | + set -e + if [[ -n $(git status --porcelain) ]]; then + echo "Here is the current git status:" + git status + echo + echo "The following changes were detected:" + git --no-pager diff + echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running `./update-changelog`" + exit 1 + fi + + - name: Generate Release Notes + uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2 + with: + args: >- + --since-tag ${{ steps.cv.outputs.result }} + --future-release ${{ steps.nv.outputs.version }} + --output release-notes.md + env: + CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Tag Release uses: ncipollo/release-action@v1 with: @@ -39,10 +70,10 @@ jobs: prerelease: false # This step should closely match what is used in `docker/Dockerfile` in vmpooler-deployment - - name: Install Ruby jruby-9.4.12.1 + - name: Install Ruby jruby-9.4.1.0 uses: ruby/setup-ruby@v1 with: - ruby-version: 'jruby-9.4.12.1' + ruby-version: 'jruby-9.4.1.0' - name: Build gem run: gem build *.gemspec diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index ba273f5..666c602 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout repo content - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 1 - name: setup ruby @@ -22,7 +22,7 @@ jobs: - name: check lock run: '[ -f "Gemfile.lock" ] && echo "package lock file exists, skipping" || bundle lock' # install java - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: distribution: 'temurin' # See 'Supported distributions' for available options java-version: '17' diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d93859a..eac55b3 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,9 +18,9 @@ jobs: strategy: matrix: ruby-version: - - 'jruby-9.4.12.1' + - 'jruby-9.4.1.0' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -34,9 +34,9 @@ jobs: strategy: matrix: ruby-version: - - 'jruby-9.4.12.1' + - 'jruby-9.4.1.0' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github_changelog_generator b/.github_changelog_generator index ebeb260..f5bee9c 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1,5 +1,3 @@ project=vmpooler user=puppetlabs -exclude_labels=maintenance -github-api=https://api.github.com -release-branch=main \ No newline at end of file +exclude_labels=maintenance \ No newline at end of file diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 7046eb6..4f0d4d3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -12,7 +12,8 @@ # SupportedStyles: with_first_parameter, with_fixed_indentation Layout/ParameterAlignment: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 9 # Cop supports --auto-correct. @@ -21,13 +22,15 @@ Layout/ParameterAlignment: Layout/CaseIndentation: Exclude: - 'lib/vmpooler/api/helpers.rb' - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. Layout/ClosingParenthesisIndentation: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. @@ -58,14 +61,16 @@ Layout/EmptyLinesAroundModuleBody: Layout/FirstHashElementIndentation: Exclude: - 'lib/vmpooler/api/helpers.rb' - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: Width, IgnoredPatterns. Layout/IndentationWidth: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. @@ -73,7 +78,8 @@ Layout/IndentationWidth: # SupportedStyles: symmetrical, new_line, same_line Layout/MultilineMethodCallBraceLayout: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. @@ -87,14 +93,16 @@ Layout/SpaceAroundEqualsInParameterDefault: # Cop supports --auto-correct. Layout/SpaceAroundKeyword: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: AllowForAlignment. Layout/SpaceAroundOperators: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 8 # Cop supports --auto-correct. @@ -109,14 +117,16 @@ Layout/SpaceInsideHashLiteralBraces: # Cop supports --auto-correct. Layout/SpaceInsideParens: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 2 # Configuration parameters: AllowSafeAssignment. Lint/AssignmentInCondition: Exclude: - 'lib/vmpooler/api/helpers.rb' - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 2 Lint/SuppressedException: @@ -148,7 +158,8 @@ Lint/UselessAssignment: Style/AndOr: Exclude: - 'lib/vmpooler/api/helpers.rb' - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 Style/CaseEquality: @@ -169,7 +180,8 @@ Style/For: Style/HashSyntax: Exclude: - 'lib/vmpooler/api/helpers.rb' - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 4 # Cop supports --auto-correct. @@ -177,7 +189,8 @@ Style/HashSyntax: Style/IfUnlessModifier: Exclude: - 'lib/vmpooler/api/helpers.rb' - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 3 # Cop supports --auto-correct. @@ -185,13 +198,15 @@ Style/IfUnlessModifier: # SupportedStyles: both, prefix, postfix Style/NegatedIf: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 3 # Cop supports --auto-correct. Style/Not: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. @@ -200,26 +215,30 @@ Style/Not: Style/NumericPredicate: Exclude: - 'spec/**/*' - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 2 # Cop supports --auto-correct. Style/ParallelAssignment: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: AllowSafeAssignment. Style/ParenthesesAroundCondition: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 2 # Cop supports --auto-correct. Style/PerlBackrefs: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist. @@ -235,7 +254,8 @@ Naming/PredicateName: # Cop supports --auto-correct. Style/RedundantParentheses: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 2 # Cop supports --auto-correct. @@ -256,7 +276,8 @@ Style/RedundantSelf: # SupportedStyles: single_quotes, double_quotes Style/StringLiterals: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. @@ -271,7 +292,8 @@ Style/TernaryParentheses: # SupportedStyles: snake_case, camelCase Naming/VariableName: Exclude: - - 'lib/vmpooler/api/v3.rb' + - 'lib/vmpooler/api/v1.rb' + - 'lib/vmpooler/api/v2.rb' # Offense count: 1 # Cop supports --auto-correct. diff --git a/CHANGELOG.md b/CHANGELOG.md index af092e8..916a9ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,187 +1,5 @@ # Changelog -## [3.8.1](https://github.com/puppetlabs/vmpooler/tree/3.8.1) (2026-01-14) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.7.0...3.8.1) - -**Implemented enhancements:** - -- \(P4DEVOPS-9434\) Add rate limiting and input validation security enhancements [\#690](https://github.com/puppetlabs/vmpooler/pull/690) ([mahima-singh](https://github.com/mahima-singh)) -- \(P4DEVOPS-8570\) Add Phase 2 optimizations: status API caching and improved Redis pipelining [\#689](https://github.com/puppetlabs/vmpooler/pull/689) ([mahima-singh](https://github.com/mahima-singh)) -- \(P4DEVOPS-8567\) Add DLQ, auto-purge, and health checks for Redis queues [\#688](https://github.com/puppetlabs/vmpooler/pull/688) ([mahima-singh](https://github.com/mahima-singh)) -- Add retry logic for immediate clone failures [\#687](https://github.com/puppetlabs/vmpooler/pull/687) ([mahima-singh](https://github.com/mahima-singh)) - -**Fixed bugs:** - -- \(P4DEVOPS-8567\) Prevent VM allocation for already-deleted request-ids [\#688](https://github.com/puppetlabs/vmpooler/pull/688) ([mahima-singh](https://github.com/mahima-singh)) -- Prevent re-queueing requests already marked as failed [\#687](https://github.com/puppetlabs/vmpooler/pull/687) ([mahima-singh](https://github.com/mahima-singh)) - -## [3.7.0](https://github.com/puppetlabs/vmpooler/tree/3.7.0) (2025-06-04) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.6.0...3.7.0) - -**Implemented enhancements:** - -- \(P4DEVOPS-6096\) Include VMs that have been requested but not moved to pending when getting queue metrics [\#681](https://github.com/puppetlabs/vmpooler/pull/681) ([isaac-hammes](https://github.com/isaac-hammes)) -- Bump redis from 5.1.0 to 5.2.0 [\#675](https://github.com/puppetlabs/vmpooler/pull/675) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rake from 13.1.0 to 13.2.1 [\#673](https://github.com/puppetlabs/vmpooler/pull/673) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump redis from 5.0.8 to 5.1.0 [\#665](https://github.com/puppetlabs/vmpooler/pull/665) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rspec from 3.12.0 to 3.13.0 [\#664](https://github.com/puppetlabs/vmpooler/pull/664) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump opentelemetry-sdk from 1.3.1 to 1.4.0 [\#663](https://github.com/puppetlabs/vmpooler/pull/663) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump mock\_redis from 0.43.0 to 0.44.0 [\#662](https://github.com/puppetlabs/vmpooler/pull/662) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump mock\_redis from 0.41.0 to 0.43.0 [\#658](https://github.com/puppetlabs/vmpooler/pull/658) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump net-ldap from 0.18.0 to 0.19.0 [\#653](https://github.com/puppetlabs/vmpooler/pull/653) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump sinatra from 3.1.0 to 3.2.0 [\#652](https://github.com/puppetlabs/vmpooler/pull/652) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump mock\_redis from 0.40.0 to 0.41.0 [\#650](https://github.com/puppetlabs/vmpooler/pull/650) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump mock\_redis from 0.37.0 to 0.40.0 [\#643](https://github.com/puppetlabs/vmpooler/pull/643) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rake from 13.0.6 to 13.1.0 [\#638](https://github.com/puppetlabs/vmpooler/pull/638) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump thor from 1.2.2 to 1.3.0 [\#635](https://github.com/puppetlabs/vmpooler/pull/635) ([dependabot[bot]](https://github.com/apps/dependabot)) - -**Fixed bugs:** - -- Bump opentelemetry-sdk from 1.4.0 to 1.4.1 [\#672](https://github.com/puppetlabs/vmpooler/pull/672) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rack from 2.2.8.1 to 2.2.9 [\#671](https://github.com/puppetlabs/vmpooler/pull/671) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump thor from 1.3.0 to 1.3.1 [\#668](https://github.com/puppetlabs/vmpooler/pull/668) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rack from 2.2.8 to 2.2.8.1 [\#666](https://github.com/puppetlabs/vmpooler/pull/666) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump concurrent-ruby from 1.2.2 to 1.2.3 [\#660](https://github.com/puppetlabs/vmpooler/pull/660) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump puma from 6.4.1 to 6.4.2 [\#655](https://github.com/puppetlabs/vmpooler/pull/655) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump puma from 6.4.0 to 6.4.1 [\#654](https://github.com/puppetlabs/vmpooler/pull/654) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update opentelemetry-instrumentation-http\_client requirement from = 0.22.2 to = 0.22.3 [\#646](https://github.com/puppetlabs/vmpooler/pull/646) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update opentelemetry-instrumentation-concurrent\_ruby requirement from = 0.21.1 to = 0.21.2 [\#645](https://github.com/puppetlabs/vmpooler/pull/645) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump opentelemetry-sdk from 1.3.0 to 1.3.1 [\#642](https://github.com/puppetlabs/vmpooler/pull/642) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump prometheus-client from 4.2.1 to 4.2.2 [\#641](https://github.com/puppetlabs/vmpooler/pull/641) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump redis from 5.0.7 to 5.0.8 [\#637](https://github.com/puppetlabs/vmpooler/pull/637) ([dependabot[bot]](https://github.com/apps/dependabot)) -- \(RE-15817\) Reword fail warning and get error from redis before generating message [\#633](https://github.com/puppetlabs/vmpooler/pull/633) ([isaac-hammes](https://github.com/isaac-hammes)) - -**Merged pull requests:** - -- \(P4DEVOPS-6096\) Fix gems to prevent warnings in logs [\#685](https://github.com/puppetlabs/vmpooler/pull/685) ([isaac-hammes](https://github.com/isaac-hammes)) -- \(maint\) Revert gems to last release [\#683](https://github.com/puppetlabs/vmpooler/pull/683) ([isaac-hammes](https://github.com/isaac-hammes)) -- Bump actions/setup-java from 3 to 4 [\#648](https://github.com/puppetlabs/vmpooler/pull/648) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump actions/github-script from 6 to 7 [\#644](https://github.com/puppetlabs/vmpooler/pull/644) ([dependabot[bot]](https://github.com/apps/dependabot)) - -## [3.6.0](https://github.com/puppetlabs/vmpooler/tree/3.6.0) (2023-10-05) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.5.1...3.6.0) - -**Fixed bugs:** - -- \(maint\) Fix message for timeout notification. [\#624](https://github.com/puppetlabs/vmpooler/pull/624) ([isaac-hammes](https://github.com/isaac-hammes)) - -**Merged pull requests:** - -- Bump rubocop from 1.56.3 to 1.56.4 [\#631](https://github.com/puppetlabs/vmpooler/pull/631) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump puma from 6.3.1 to 6.4.0 [\#630](https://github.com/puppetlabs/vmpooler/pull/630) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rubocop from 1.56.2 to 1.56.3 [\#628](https://github.com/puppetlabs/vmpooler/pull/628) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump actions/checkout from 3 to 4 [\#627](https://github.com/puppetlabs/vmpooler/pull/627) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update opentelemetry-resource\_detectors requirement from = 0.24.1 to = 0.24.2 [\#626](https://github.com/puppetlabs/vmpooler/pull/626) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rubocop from 1.56.1 to 1.56.2 [\#625](https://github.com/puppetlabs/vmpooler/pull/625) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rubocop from 1.56.0 to 1.56.1 [\#623](https://github.com/puppetlabs/vmpooler/pull/623) ([dependabot[bot]](https://github.com/apps/dependabot)) - -## [3.5.1](https://github.com/puppetlabs/vmpooler/tree/3.5.1) (2023-08-24) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.5.0...3.5.1) - -**Fixed bugs:** - -- \(maint\) Fix bugs from redis and timeout notification updates. [\#621](https://github.com/puppetlabs/vmpooler/pull/621) ([isaac-hammes](https://github.com/isaac-hammes)) - -## [3.5.0](https://github.com/puppetlabs/vmpooler/tree/3.5.0) (2023-08-23) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.4.0...3.5.0) - -**Implemented enhancements:** - -- Improve LDAP auth [\#616](https://github.com/puppetlabs/vmpooler/issues/616) -- \(maint\) Raise error when ip address is not given to vm after clone. [\#619](https://github.com/puppetlabs/vmpooler/pull/619) ([isaac-hammes](https://github.com/isaac-hammes)) -- \(POD-8\) Add timeout\_notification config to log warning before vm is destroyed. [\#618](https://github.com/puppetlabs/vmpooler/pull/618) ([isaac-hammes](https://github.com/isaac-hammes)) -- \(RE-15565\) Add ability to use bind\_as with a service account [\#617](https://github.com/puppetlabs/vmpooler/pull/617) ([yachub](https://github.com/yachub)) - -**Merged pull requests:** - -- Bump puma from 6.3.0 to 6.3.1 [\#615](https://github.com/puppetlabs/vmpooler/pull/615) ([dependabot[bot]](https://github.com/apps/dependabot)) - -## [3.4.0](https://github.com/puppetlabs/vmpooler/tree/3.4.0) (2023-08-18) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.3.0...3.4.0) - -**Implemented enhancements:** - -- \(POD-10\) Log reason for failed VM checks. [\#611](https://github.com/puppetlabs/vmpooler/pull/611) ([isaac-hammes](https://github.com/isaac-hammes)) - -**Closed issues:** - -- Log reason connection on port 22 of a failed VM [\#609](https://github.com/puppetlabs/vmpooler/issues/609) - -## [3.3.0](https://github.com/puppetlabs/vmpooler/tree/3.3.0) (2023-08-16) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.2.0...3.3.0) - -**Closed issues:** - -- Redis 5.x Deprecations [\#603](https://github.com/puppetlabs/vmpooler/issues/603) - -**Merged pull requests:** - -- Update rubocop requirement from ~\> 1.55.1 to ~\> 1.56.0 [\#608](https://github.com/puppetlabs/vmpooler/pull/608) ([dependabot[bot]](https://github.com/apps/dependabot)) - -## [3.2.0](https://github.com/puppetlabs/vmpooler/tree/3.2.0) (2023-08-10) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.1.0...3.2.0) - -**Implemented enhancements:** - -- \(maint\) Update opentelemetry gems. [\#606](https://github.com/puppetlabs/vmpooler/pull/606) ([isaac-hammes](https://github.com/isaac-hammes)) -- Bump jruby to 9.4.3.0 and bundle update [\#604](https://github.com/puppetlabs/vmpooler/pull/604) ([yachub](https://github.com/yachub)) - -**Fixed bugs:** - -- \(RE-15692\) Do not attempt loading DNS classes if none are defined [\#602](https://github.com/puppetlabs/vmpooler/pull/602) ([yachub](https://github.com/yachub)) - -**Closed issues:** - -- Fix startup error when not using any dns plugins [\#601](https://github.com/puppetlabs/vmpooler/issues/601) - -**Merged pull requests:** - -- Bump prometheus-client from 4.1.0 to 4.2.1 [\#599](https://github.com/puppetlabs/vmpooler/pull/599) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update rubocop requirement from ~\> 1.54.2 to ~\> 1.55.1 [\#597](https://github.com/puppetlabs/vmpooler/pull/597) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rack from 2.2.7 to 2.2.8 [\#594](https://github.com/puppetlabs/vmpooler/pull/594) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update rubocop requirement from ~\> 1.51.0 to ~\> 1.54.2 [\#593](https://github.com/puppetlabs/vmpooler/pull/593) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump puma from 6.2.2 to 6.3.0 [\#586](https://github.com/puppetlabs/vmpooler/pull/586) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump connection\_pool from 2.4.0 to 2.4.1 [\#583](https://github.com/puppetlabs/vmpooler/pull/583) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update rubocop requirement from ~\> 1.50.1 to ~\> 1.51.0 [\#582](https://github.com/puppetlabs/vmpooler/pull/582) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump thor from 1.2.1 to 1.2.2 [\#581](https://github.com/puppetlabs/vmpooler/pull/581) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rack from 2.2.6.4 to 2.2.7 [\#579](https://github.com/puppetlabs/vmpooler/pull/579) ([dependabot[bot]](https://github.com/apps/dependabot)) - -## [3.1.0](https://github.com/puppetlabs/vmpooler/tree/3.1.0) (2023-05-01) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/3.0.0...3.1.0) - -**Merged pull requests:** - -- Bump rubocop from 1.50.1 to 1.50.2 [\#578](https://github.com/puppetlabs/vmpooler/pull/578) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update puma requirement from ~\> 5.0, \>= 5.0.4 to \>= 5.0.4, \< 7 [\#577](https://github.com/puppetlabs/vmpooler/pull/577) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update opentelemetry-resource\_detectors requirement from = 0.19.1 to = 0.23.0 [\#576](https://github.com/puppetlabs/vmpooler/pull/576) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Migrate issue management to Jira [\#575](https://github.com/puppetlabs/vmpooler/pull/575) ([yachub](https://github.com/yachub)) -- Bump jruby to 9.4.2.0 [\#574](https://github.com/puppetlabs/vmpooler/pull/574) ([yachub](https://github.com/yachub)) -- Update rubocop requirement from ~\> 1.28.2 to ~\> 1.50.1 [\#573](https://github.com/puppetlabs/vmpooler/pull/573) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update sinatra requirement from ~\> 2.0 to \>= 2, \< 4 [\#572](https://github.com/puppetlabs/vmpooler/pull/572) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump net-ldap from 0.17.1 to 0.18.0 [\#571](https://github.com/puppetlabs/vmpooler/pull/571) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update prometheus-client requirement from ~\> 2.0 to \>= 2, \< 5 [\#566](https://github.com/puppetlabs/vmpooler/pull/566) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump rack-test from 2.0.2 to 2.1.0 [\#564](https://github.com/puppetlabs/vmpooler/pull/564) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update rack requirement from ~\> 2.2 to \>= 2.2, \< 4.0 [\#562](https://github.com/puppetlabs/vmpooler/pull/562) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Update opentelemetry-exporter-jaeger requirement from = 0.20.1 to = 0.22.0 [\#524](https://github.com/puppetlabs/vmpooler/pull/524) ([dependabot[bot]](https://github.com/apps/dependabot)) - -## [3.0.0](https://github.com/puppetlabs/vmpooler/tree/3.0.0) (2023-03-28) - -[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/2.5.0...3.0.0) - -**Breaking changes:** - -- Direct Users to vmpooler-deployment [\#568](https://github.com/puppetlabs/vmpooler/pull/568) ([yachub](https://github.com/yachub)) -- \(RE-15124\) Implement DNS Plugins and Remove api v1 and v2 [\#551](https://github.com/puppetlabs/vmpooler/pull/551) ([yachub](https://github.com/yachub)) - ## [2.5.0](https://github.com/puppetlabs/vmpooler/tree/2.5.0) (2023-03-06) [Full Changelog](https://github.com/puppetlabs/vmpooler/compare/2.4.0...2.5.0) @@ -246,7 +64,6 @@ - \(maint\) Adding a provider method tag\_vm\_user [\#469](https://github.com/puppetlabs/vmpooler/pull/469) ([sbeaulie](https://github.com/sbeaulie)) - Update testing.yml [\#468](https://github.com/puppetlabs/vmpooler/pull/468) ([sbeaulie](https://github.com/sbeaulie)) - Move vsphere specific methods out of vmpooler [\#467](https://github.com/puppetlabs/vmpooler/pull/467) ([sbeaulie](https://github.com/sbeaulie)) -- Release prep for v2.0.0 [\#465](https://github.com/puppetlabs/vmpooler/pull/465) ([genebean](https://github.com/genebean)) ## [2.0.0](https://github.com/puppetlabs/vmpooler/tree/2.0.0) (2021-12-08) @@ -255,6 +72,7 @@ **Merged pull requests:** - Use credentials file for Rubygems auth [\#466](https://github.com/puppetlabs/vmpooler/pull/466) ([genebean](https://github.com/genebean)) +- Release prep for v2.0.0 [\#465](https://github.com/puppetlabs/vmpooler/pull/465) ([genebean](https://github.com/genebean)) - Add Gem release workflow [\#464](https://github.com/puppetlabs/vmpooler/pull/464) ([genebean](https://github.com/genebean)) - Update icon in the readme to reference this repo [\#463](https://github.com/puppetlabs/vmpooler/pull/463) ([genebean](https://github.com/genebean)) - \(DIO-2769\) Move vsphere provider to its own gem [\#462](https://github.com/puppetlabs/vmpooler/pull/462) ([genebean](https://github.com/genebean)) @@ -299,17 +117,13 @@ **Merged pull requests:** - \(POOLER-176\) Add Operation Label to User Metric [\#455](https://github.com/puppetlabs/vmpooler/pull/455) ([yachub](https://github.com/yachub)) +- Update OTel gems to 0.15.0 [\#450](https://github.com/puppetlabs/vmpooler/pull/450) ([genebean](https://github.com/genebean)) +- Migrate testing to GH Actions from Travis [\#446](https://github.com/puppetlabs/vmpooler/pull/446) ([genebean](https://github.com/genebean)) ## [1.1.0-rc.1](https://github.com/puppetlabs/vmpooler/tree/1.1.0-rc.1) (2021-08-11) [Full Changelog](https://github.com/puppetlabs/vmpooler/compare/1.0.0...1.1.0-rc.1) -**Merged pull requests:** - -- \(POOLER-176\) Add Operation Label to User Metric [\#454](https://github.com/puppetlabs/vmpooler/pull/454) ([yachub](https://github.com/yachub)) -- Update OTel gems to 0.15.0 [\#450](https://github.com/puppetlabs/vmpooler/pull/450) ([genebean](https://github.com/genebean)) -- Migrate testing to GH Actions from Travis [\#446](https://github.com/puppetlabs/vmpooler/pull/446) ([genebean](https://github.com/genebean)) - ## [1.0.0](https://github.com/puppetlabs/vmpooler/tree/1.0.0) (2021-02-02) [Full Changelog](https://github.com/puppetlabs/vmpooler/compare/0.18.2...1.0.0) @@ -818,13 +632,13 @@ - Do not have a hardcoded list of VM providers [\#230](https://github.com/puppetlabs/vmpooler/issues/230) - Use a dynamic check\_pool period [\#226](https://github.com/puppetlabs/vmpooler/issues/226) - vmpooler doesn't seem to recognize ready VMs [\#218](https://github.com/puppetlabs/vmpooler/issues/218) -- `find\_vmdks` in `vsphere\_helper` should not use `vmdk\_datastore.\_connection` [\#213](https://github.com/puppetlabs/vmpooler/issues/213) -- `get\_base\_vm\_container\_from` in `vsphere\_helper` ensures the wrong connection [\#212](https://github.com/puppetlabs/vmpooler/issues/212) +- `find_vmdks` in `vsphere_helper` should not use `vmdk_datastore._connection` [\#213](https://github.com/puppetlabs/vmpooler/issues/213) +- `get_base_vm_container_from` in `vsphere_helper` ensures the wrong connection [\#212](https://github.com/puppetlabs/vmpooler/issues/212) - `close` in vsphere\_helper throws an error if a connection was never made [\#211](https://github.com/puppetlabs/vmpooler/issues/211) -- `find\_pool` in vsphere\_helper.rb has subtle errors [\#210](https://github.com/puppetlabs/vmpooler/issues/210) -- `find\_pool` in vsphere\_helper tends to throw instead of returning nil for missing pools [\#209](https://github.com/puppetlabs/vmpooler/issues/209) +- `find_pool` in vsphere\_helper.rb has subtle errors [\#210](https://github.com/puppetlabs/vmpooler/issues/210) +- `find_pool` in vsphere\_helper tends to throw instead of returning nil for missing pools [\#209](https://github.com/puppetlabs/vmpooler/issues/209) - Vsphere connections are always insecure \(Ignore cert errors\) [\#207](https://github.com/puppetlabs/vmpooler/issues/207) -- `find\_folder` in vsphere\_helper.rb has subtle errors [\#204](https://github.com/puppetlabs/vmpooler/issues/204) +- `find_folder` in vsphere\_helper.rb has subtle errors [\#204](https://github.com/puppetlabs/vmpooler/issues/204) - Should not use `abort` in vsphere\_helper [\#203](https://github.com/puppetlabs/vmpooler/issues/203) - No reason why get\_snapshot\_list is defined in vsphere\_helper [\#202](https://github.com/puppetlabs/vmpooler/issues/202) - Setting max\_tries in configuration results in vSphereHelper going into infinite loop [\#199](https://github.com/puppetlabs/vmpooler/issues/199) @@ -886,7 +700,7 @@ - \(POOLER-93\) Extend API endpoint to provide just what is needed [\#245](https://github.com/puppetlabs/vmpooler/pull/245) ([sbeaulie](https://github.com/sbeaulie)) - \(POOLER-92\) Add the alias information in the API status page for each… [\#244](https://github.com/puppetlabs/vmpooler/pull/244) ([sbeaulie](https://github.com/sbeaulie)) - \(QENG-5305\) Improve vmpooler host selection [\#242](https://github.com/puppetlabs/vmpooler/pull/242) ([mattkirby](https://github.com/mattkirby)) -- Allow user to specify a configuration file in VMPOOLER\_CONFIG\_FILE variable [\#241](https://github.com/puppetlabs/vmpooler/pull/241) ([amcdson](https://github.com/amcdson)) +- Allow user to specify a configuration file in VMPOOLER\_CONFIG\_FILE variable [\#241](https://github.com/puppetlabs/vmpooler/pull/241) ([adamdav](https://github.com/adamdav)) - Fix no implicit conversion to rational from nil [\#239](https://github.com/puppetlabs/vmpooler/pull/239) ([sbeaulie](https://github.com/sbeaulie)) - Updated Vagrant box and associated docs [\#237](https://github.com/puppetlabs/vmpooler/pull/237) ([genebean](https://github.com/genebean)) - \(GH-226\) Respond quickly to VMs being consumed [\#236](https://github.com/puppetlabs/vmpooler/pull/236) ([glennsarti](https://github.com/glennsarti)) @@ -920,7 +734,88 @@ - \(maint\) Add rubocop and allow failures in Travis CI [\#183](https://github.com/puppetlabs/vmpooler/pull/183) ([glennsarti](https://github.com/glennsarti)) - \(POOLER-73\) Update unit tests prior to refactoring [\#182](https://github.com/puppetlabs/vmpooler/pull/182) ([glennsarti](https://github.com/glennsarti)) - \(POOLER-71\) Add dummy authentication provider [\#180](https://github.com/puppetlabs/vmpooler/pull/180) ([glennsarti](https://github.com/glennsarti)) +- \(maint\) Remove Ruby 1.9.3 testing from Travis [\#178](https://github.com/puppetlabs/vmpooler/pull/178) ([glennsarti](https://github.com/glennsarti)) - \(maint\) Enhance VM Pooler developer experience [\#177](https://github.com/puppetlabs/vmpooler/pull/177) ([glennsarti](https://github.com/glennsarti)) +- \(POOLER-47\) Send clone errors up [\#175](https://github.com/puppetlabs/vmpooler/pull/175) ([mattkirby](https://github.com/mattkirby)) +- \(POOLER-48\) Clear migrations at application start time [\#174](https://github.com/puppetlabs/vmpooler/pull/174) ([mattkirby](https://github.com/mattkirby)) +- Add retry logic with a delay for vsphere connections [\#173](https://github.com/puppetlabs/vmpooler/pull/173) ([mattkirby](https://github.com/mattkirby)) +- \(POOLER-44\) Fix vmpooler.migrate reference [\#172](https://github.com/puppetlabs/vmpooler/pull/172) ([mattkirby](https://github.com/mattkirby)) +- Add `puma` as required gem [\#171](https://github.com/puppetlabs/vmpooler/pull/171) ([sschneid](https://github.com/sschneid)) +- Fix JavaScript error on nil `weekly_data` [\#170](https://github.com/puppetlabs/vmpooler/pull/170) ([sschneid](https://github.com/sschneid)) +- Containerize vmpooler [\#169](https://github.com/puppetlabs/vmpooler/pull/169) ([sschneid](https://github.com/sschneid)) +- Add vagrant-vmpooler plugin to readme [\#168](https://github.com/puppetlabs/vmpooler/pull/168) ([briancain](https://github.com/briancain)) +- Improve vmpooler scheduling logic [\#167](https://github.com/puppetlabs/vmpooler/pull/167) ([mattkirby](https://github.com/mattkirby)) +- \[QENG-4181\] Add per-pool stats to `/status` API [\#162](https://github.com/puppetlabs/vmpooler/pull/162) ([rick](https://github.com/rick)) +- Merge CI.next into Master [\#161](https://github.com/puppetlabs/vmpooler/pull/161) ([shermdog](https://github.com/shermdog)) +- \(maint\) update README.md and LICENSE to reflect rebranding [\#157](https://github.com/puppetlabs/vmpooler/pull/157) ([erosa](https://github.com/erosa)) +- Add info about vmfloaty [\#156](https://github.com/puppetlabs/vmpooler/pull/156) ([briancain](https://github.com/briancain)) +- Added IP lookup functionality for /vm/hostname [\#154](https://github.com/puppetlabs/vmpooler/pull/154) ([frozenfoxx](https://github.com/frozenfoxx)) +- Improved tests for vmpooler [\#152](https://github.com/puppetlabs/vmpooler/pull/152) ([rick](https://github.com/rick)) +- Added prefix parameter to the vmpooler configuration [\#149](https://github.com/puppetlabs/vmpooler/pull/149) ([frozenfoxx](https://github.com/frozenfoxx)) +- Update license copyright [\#148](https://github.com/puppetlabs/vmpooler/pull/148) ([sschneid](https://github.com/sschneid)) +- Allow new disks to be added to running VMs via vmpooler API [\#147](https://github.com/puppetlabs/vmpooler/pull/147) ([sschneid](https://github.com/sschneid)) +- Updated YAML config variables in create\_template\_deltas.rb [\#145](https://github.com/puppetlabs/vmpooler/pull/145) ([frozenfoxx](https://github.com/frozenfoxx)) +- \(QA-2036\) Update README for Client Utility [\#143](https://github.com/puppetlabs/vmpooler/pull/143) ([cowofevil](https://github.com/cowofevil)) +- add guestinfo.hostname to VirtualMachineConfigSpecs [\#139](https://github.com/puppetlabs/vmpooler/pull/139) ([heathseals](https://github.com/heathseals)) +- \(QENG-2807\) Allow pool 'alias' names [\#138](https://github.com/puppetlabs/vmpooler/pull/138) ([sschneid](https://github.com/sschneid)) +- \(QENG-2995\) Display associated VMs in GET /token/:token endpoint [\#137](https://github.com/puppetlabs/vmpooler/pull/137) ([sschneid](https://github.com/sschneid)) +- Update API docs to include "domain" key for get vm requests [\#136](https://github.com/puppetlabs/vmpooler/pull/136) ([briancain](https://github.com/briancain)) +- \(MAINT\) Remove Ping Check on Running VMs [\#133](https://github.com/puppetlabs/vmpooler/pull/133) ([colinPL](https://github.com/colinPL)) +- \(maint\) Move VM Only When SSH Check Succeeds [\#131](https://github.com/puppetlabs/vmpooler/pull/131) ([colinPL](https://github.com/colinPL)) +- \(QENG-2952\) Check that SSH is available [\#130](https://github.com/puppetlabs/vmpooler/pull/130) ([sschneid](https://github.com/sschneid)) +- \(maint\) Update license copyright [\#128](https://github.com/puppetlabs/vmpooler/pull/128) ([sschneid](https://github.com/sschneid)) +- \(maint\) Remove duplicate \(nested\) "ok" responses [\#127](https://github.com/puppetlabs/vmpooler/pull/127) ([sschneid](https://github.com/sschneid)) +- \(maint\) Documentation updates [\#126](https://github.com/puppetlabs/vmpooler/pull/126) ([sschneid](https://github.com/sschneid)) +- Track token use times [\#125](https://github.com/puppetlabs/vmpooler/pull/125) ([sschneid](https://github.com/sschneid)) +- Docs update [\#124](https://github.com/puppetlabs/vmpooler/pull/124) ([sschneid](https://github.com/sschneid)) +- User token list [\#123](https://github.com/puppetlabs/vmpooler/pull/123) ([sschneid](https://github.com/sschneid)) +- \(maint\) Additional utility and reporting scripts [\#122](https://github.com/puppetlabs/vmpooler/pull/122) ([sschneid](https://github.com/sschneid)) +- \(maint\) Syntax fixup [\#121](https://github.com/puppetlabs/vmpooler/pull/121) ([sschneid](https://github.com/sschneid)) +- \(MAINT\) Reduce redis Calls in API [\#120](https://github.com/puppetlabs/vmpooler/pull/120) ([colinPL](https://github.com/colinPL)) +- \(maint\) Use expect\_json helper method for determining JSON response status [\#119](https://github.com/puppetlabs/vmpooler/pull/119) ([sschneid](https://github.com/sschneid)) +- \(QENG-1304\) vmpooler should require an auth key for VM destruction [\#118](https://github.com/puppetlabs/vmpooler/pull/118) ([sschneid](https://github.com/sschneid)) +- \(QENG-2636\) Host snapshots [\#117](https://github.com/puppetlabs/vmpooler/pull/117) ([sschneid](https://github.com/sschneid)) +- \(maint\) Use dep caching and containers [\#116](https://github.com/puppetlabs/vmpooler/pull/116) ([sschneid](https://github.com/sschneid)) +- \(maint\) Include travis-ci build status in README [\#115](https://github.com/puppetlabs/vmpooler/pull/115) ([sschneid](https://github.com/sschneid)) +- Show test contexts and names [\#114](https://github.com/puppetlabs/vmpooler/pull/114) ([sschneid](https://github.com/sschneid)) +- \(QENG-2246\) Add Default Rake Task [\#113](https://github.com/puppetlabs/vmpooler/pull/113) ([colinPL](https://github.com/colinPL)) +- Log empty pools [\#112](https://github.com/puppetlabs/vmpooler/pull/112) ([sschneid](https://github.com/sschneid)) +- \(QENG-2246\) Add Travis CI [\#111](https://github.com/puppetlabs/vmpooler/pull/111) ([colinPL](https://github.com/colinPL)) +- \(QENG-2388\) Tagging restrictions [\#110](https://github.com/puppetlabs/vmpooler/pull/110) ([sschneid](https://github.com/sschneid)) +- An updated dashboard [\#109](https://github.com/puppetlabs/vmpooler/pull/109) ([sschneid](https://github.com/sschneid)) +- API summary rework [\#108](https://github.com/puppetlabs/vmpooler/pull/108) ([sschneid](https://github.com/sschneid)) +- Only filter regex matches [\#106](https://github.com/puppetlabs/vmpooler/pull/106) ([sschneid](https://github.com/sschneid)) +- \(QENG-2518\) Tag-filtering [\#105](https://github.com/puppetlabs/vmpooler/pull/105) ([sschneid](https://github.com/sschneid)) +- \(QENG-2360\) check\_running\_vm Spec Tests [\#104](https://github.com/puppetlabs/vmpooler/pull/104) ([colinPL](https://github.com/colinPL)) +- \(QENG-2056\) Create daily tag indexes, report in /summary [\#102](https://github.com/puppetlabs/vmpooler/pull/102) ([sschneid](https://github.com/sschneid)) +- Store token metadata in vmpooler\_\_vm\_\_ Redis hash [\#101](https://github.com/puppetlabs/vmpooler/pull/101) ([sschneid](https://github.com/sschneid)) +- Display VM state in GET /vm/:hostname route [\#100](https://github.com/puppetlabs/vmpooler/pull/100) ([sschneid](https://github.com/sschneid)) +- Add basic auth token functionality [\#98](https://github.com/puppetlabs/vmpooler/pull/98) ([sschneid](https://github.com/sschneid)) +- Add basic HTTP authentication and /token routes [\#97](https://github.com/puppetlabs/vmpooler/pull/97) ([sschneid](https://github.com/sschneid)) +- \(QENG-2208\) Add more helper tests [\#95](https://github.com/puppetlabs/vmpooler/pull/95) ([colinPL](https://github.com/colinPL)) +- \(QENG-2208\) Move Sinatra Helpers to own file [\#94](https://github.com/puppetlabs/vmpooler/pull/94) ([colinPL](https://github.com/colinPL)) +- Fix rspec tests broken in f9de28236b726e37977123cea9b4f3a562bfdcdb [\#93](https://github.com/puppetlabs/vmpooler/pull/93) ([sschneid](https://github.com/sschneid)) +- Redirect / to /dashboard [\#92](https://github.com/puppetlabs/vmpooler/pull/92) ([sschneid](https://github.com/sschneid)) +- Ensure 'lifetime' val returned by GET /vm/:hostname is an int [\#91](https://github.com/puppetlabs/vmpooler/pull/91) ([sschneid](https://github.com/sschneid)) +- running-to-lifetime comparison should be 'greater than or equal to' [\#90](https://github.com/puppetlabs/vmpooler/pull/90) ([sschneid](https://github.com/sschneid)) +- Auto-expire Redis metadata key via Redis EXPIRE [\#89](https://github.com/puppetlabs/vmpooler/pull/89) ([sschneid](https://github.com/sschneid)) +- \(QENG-1906\) Add specs for Dashboard and root API class [\#88](https://github.com/puppetlabs/vmpooler/pull/88) ([colinPL](https://github.com/colinPL)) +- \(maint\) Fix bad redis reference [\#87](https://github.com/puppetlabs/vmpooler/pull/87) ([colinPL](https://github.com/colinPL)) +- \(QENG-1906\) Break apart check\_pending\_vm and add spec tests [\#86](https://github.com/puppetlabs/vmpooler/pull/86) ([colinPL](https://github.com/colinPL)) +- Remove defined? when checking configuration for graphite server. [\#85](https://github.com/puppetlabs/vmpooler/pull/85) ([colinPL](https://github.com/colinPL)) +- \(QENG-1906\) Add spec tests for Janitor [\#78](https://github.com/puppetlabs/vmpooler/pull/78) ([colinPL](https://github.com/colinPL)) +- \(QENG-1906\) Refactor initialize to allow config passing [\#77](https://github.com/puppetlabs/vmpooler/pull/77) ([colinPL](https://github.com/colinPL)) +- Use 'checkout' time to calculate 'running' time [\#75](https://github.com/puppetlabs/vmpooler/pull/75) ([sschneid](https://github.com/sschneid)) +- Catch improperly-formatted data payloads [\#73](https://github.com/puppetlabs/vmpooler/pull/73) ([sschneid](https://github.com/sschneid)) +- \(QENG-1905\) Adding VM-tagging support via PUT /vm/:hostname endpoint [\#72](https://github.com/puppetlabs/vmpooler/pull/72) ([sschneid](https://github.com/sschneid)) +- \(QENG-2057\) Historic Redis VM metadata [\#71](https://github.com/puppetlabs/vmpooler/pull/71) ([sschneid](https://github.com/sschneid)) +- \(QENG-1899\) Add documentation for /summary [\#67](https://github.com/puppetlabs/vmpooler/pull/67) ([colinPL](https://github.com/colinPL)) +- Use $redis.hgetall rather than hget in a loop [\#66](https://github.com/puppetlabs/vmpooler/pull/66) ([sschneid](https://github.com/sschneid)) +- /summary per-pool metrics [\#65](https://github.com/puppetlabs/vmpooler/pull/65) ([sschneid](https://github.com/sschneid)) +- Show boot metrics in /status and /summary endpoints [\#64](https://github.com/puppetlabs/vmpooler/pull/64) ([sschneid](https://github.com/sschneid)) +- \(maint\) Fixing spacing [\#63](https://github.com/puppetlabs/vmpooler/pull/63) ([sschneid](https://github.com/sschneid)) +- Metric calc via helpers [\#62](https://github.com/puppetlabs/vmpooler/pull/62) ([sschneid](https://github.com/sschneid)) +- More granular metrics [\#61](https://github.com/puppetlabs/vmpooler/pull/61) ([sschneid](https://github.com/sschneid)) diff --git a/Gemfile b/Gemfile index 0313b80..122d6b5 100644 --- a/Gemfile +++ b/Gemfile @@ -3,11 +3,11 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' gemspec # Evaluate Gemfile.local if it exists -if File.exist? "#{__FILE__}.local" +if File.exists? "#{__FILE__}.local" instance_eval(File.read("#{__FILE__}.local")) end # Evaluate ~/.gemfile if it exists -if File.exist?(File.join(Dir.home, '.gemfile')) +if File.exists?(File.join(Dir.home, '.gemfile')) instance_eval(File.read(File.join(Dir.home, '.gemfile'))) end diff --git a/Gemfile.lock b/Gemfile.lock index a63b584..a05c75b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,219 +1,185 @@ PATH remote: . specs: - vmpooler (3.8.1) + vmpooler (2.5.0) concurrent-ruby (~> 1.1) - connection_pool (~> 2.4) + connection_pool (~> 2.2) deep_merge (~> 1.2) net-ldap (~> 0.16) - opentelemetry-exporter-jaeger (= 0.23.0) - opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) - opentelemetry-instrumentation-http_client (= 0.22.2) - opentelemetry-instrumentation-rack (= 0.23.4) - opentelemetry-instrumentation-redis (= 0.25.3) - opentelemetry-instrumentation-sinatra (= 0.23.2) - opentelemetry-resource_detectors (= 0.24.2) - opentelemetry-sdk (~> 1.8) + opentelemetry-exporter-jaeger (= 0.20.1) + opentelemetry-instrumentation-concurrent_ruby (= 0.19.2) + opentelemetry-instrumentation-http_client (= 0.19.4) + opentelemetry-instrumentation-redis (= 0.21.3) + opentelemetry-instrumentation-sinatra (= 0.19.3) + opentelemetry-resource_detectors (= 0.19.1) + opentelemetry-sdk (~> 1.0, >= 1.0.2) pickup (~> 0.0.11) - prometheus-client (>= 2, < 5) - puma (>= 5.0.4, < 7) - rack (>= 2.2, < 4.0) + prometheus-client (~> 2.0) + puma (~> 5.0, >= 5.0.4) + rack (~> 2.2) rake (~> 13.0) - redis (~> 5.0) - sinatra (>= 2, < 4) + redis (~> 4.1) + sinatra (~> 2.0) spicy-proton (~> 2.1) statsd-ruby (~> 1.4) GEM remote: https://rubygems.org/ specs: - ast (2.4.3) - base64 (0.1.2) - bindata (2.5.1) - builder (3.3.0) + ast (2.4.2) + bindata (2.4.15) + builder (3.2.4) climate_control (1.2.0) coderay (1.1.3) - concurrent-ruby (1.3.5) - connection_pool (2.5.3) + concurrent-ruby (1.2.2) + connection_pool (2.3.0) deep_merge (1.2.2) - diff-lcs (1.6.2) - docile (1.4.1) - faraday (2.13.1) - faraday-net_http (>= 2.0, < 3.5) - json - logger - faraday-net_http (3.4.0) - net-http (>= 0.5.0) - ffi (1.17.2-java) - google-cloud-env (2.2.1) - faraday (>= 1.0, < 3.a) - json (2.12.2) - json (2.12.2-java) - language_server-protocol (3.17.0.5) - logger (1.7.0) - method_source (1.1.0) - mock_redis (0.37.0) - mustermann (3.0.3) + diff-lcs (1.5.0) + docile (1.4.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.15.5-java) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + method_source (1.0.0) + mock_redis (0.36.0) + ruby2_keywords + mustermann (2.0.2) ruby2_keywords (~> 0.0.1) - net-http (0.6.0) - uri - net-ldap (0.19.0) - nio4r (2.7.4) - nio4r (2.7.4-java) - opentelemetry-api (1.5.0) - opentelemetry-common (0.20.1) + net-ldap (0.17.1) + nio4r (2.5.8) + nio4r (2.5.8-java) + opentelemetry-api (1.1.0) + opentelemetry-common (0.19.6) opentelemetry-api (~> 1.0) - opentelemetry-exporter-jaeger (0.23.0) - opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.20) - opentelemetry-sdk (~> 1.2) - opentelemetry-semantic_conventions - thrift - opentelemetry-instrumentation-base (0.22.3) + opentelemetry-exporter-jaeger (0.20.1) opentelemetry-api (~> 1.0) - opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-concurrent_ruby (0.21.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http_client (0.22.2) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.23.4) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-redis (0.25.3) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-sinatra (0.23.2) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-registry (0.4.0) - opentelemetry-api (~> 1.1) - opentelemetry-resource_detectors (0.24.2) - google-cloud-env + opentelemetry-common (~> 0.19.2) opentelemetry-sdk (~> 1.0) - opentelemetry-sdk (1.8.0) + thrift + opentelemetry-instrumentation-base (0.19.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-concurrent_ruby (0.19.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-http_client (0.19.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-redis (0.21.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-sinatra (0.19.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-registry (0.2.0) opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.20) + opentelemetry-resource_detectors (0.19.1) + google-cloud-env + opentelemetry-sdk + opentelemetry-sdk (1.2.0) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.19.3) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.11.0) + opentelemetry-semantic_conventions (1.8.0) opentelemetry-api (~> 1.0) - parallel (1.27.0) - parser (3.3.8.0) + parallel (1.22.1) + parser (3.2.1.0) ast (~> 2.4.1) - racc pickup (0.0.11) - prism (1.4.0) - prometheus-client (4.2.4) - base64 - pry (0.15.2) + prometheus-client (2.1.0) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry (0.15.2-java) + pry (0.14.2-java) coderay (~> 1.1) method_source (~> 1.0) spoon (~> 0.0) - puma (6.6.0) + puma (5.6.5) nio4r (~> 2.0) - puma (6.6.0-java) + puma (5.6.5-java) nio4r (~> 2.0) - racc (1.8.1) - racc (1.8.1-java) - rack (2.2.17) - rack-protection (3.2.0) - base64 (>= 0.1.0) - rack (~> 2.2, >= 2.2.4) - rack-test (2.2.0) + rack (2.2.6.2) + rack-protection (2.2.4) + rack + rack-test (2.0.2) rack (>= 1.3) rainbow (3.1.1) - rake (13.3.0) - redis (5.4.0) - redis-client (>= 0.22.0) - redis-client (0.24.0) - connection_pool - regexp_parser (2.10.0) - rexml (3.4.1) - rspec (3.13.1) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.4) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.5) + rake (13.0.6) + redis (4.8.1) + regexp_parser (2.7.0) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.5) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.4) - rubocop (1.56.4) - base64 (~> 0.1.1) - json (~> 2.3) - language_server-protocol (>= 3.17.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rubocop (1.28.2) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rexml + rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.44.1) - parser (>= 3.3.7.2) - prism (~> 1.4) - ruby-progressbar (1.13.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.27.0) + parser (>= 3.2.1.0) + ruby-progressbar (1.12.0) ruby2_keywords (0.0.5) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.13.1) + simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sinatra (3.2.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.2.0) + sinatra (2.2.4) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.4) tilt (~> 2.0) spicy-proton (2.1.15) bindata (~> 2.3) spoon (0.0.6) ffi statsd-ruby (1.5.0) - thor (1.3.2) - thrift (0.22.0) - tilt (2.6.0) - unicode-display_width (2.6.0) - uri (1.0.3) + thor (1.2.1) + thrift (0.18.1) + tilt (2.1.0) + unicode-display_width (2.4.2) yarjuf (2.0.0) builder rspec (~> 3) PLATFORMS - arm64-darwin-22 - arm64-darwin-23 - arm64-darwin-25 + universal-java-1.8 universal-java-11 - universal-java-17 - x86_64-darwin-22 x86_64-linux DEPENDENCIES climate_control (>= 0.2.0) - mock_redis (= 0.37.0) + mock_redis (>= 0.17.0) pry rack-test (>= 0.6) rspec (>= 3.2) - rubocop (~> 1.56.0) + rubocop (~> 1.28.2) simplecov (>= 0.11.2) thor (~> 1.0, >= 1.0.1) vmpooler! yarjuf (>= 2.0) BUNDLED WITH - 2.4.18 + 2.3.18 diff --git a/README.md b/README.md index a05bcec..08af5d3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ - [VMPooler](#vmpooler) - [Usage](#usage) - - [Migrating to v3](#migrating-to-v3) - [v2.0.0 note](#v200-note) - [Installation](#installation) - [Dependencies](#dependencies) @@ -31,40 +30,6 @@ VMPooler provides configurable 'pools' of instantly-available (pre-provisioned) At [Puppet, Inc.](http://puppet.com) we run acceptance tests on thousands of disposable VMs every day. VMPooler manages the life cycle of these VMs from request through deletion, with options available to pool ready instances, and provision on demand. -The recommended method for deploying VMPooler is via [https://github.com/puppetlabs/vmpooler-deployment](vmpooler-deployment). - -### Migrating to v3 - -Starting with the v3.x release, management of DNS records is implemented as DNS plugins, similar to compute providers. This means each pool configuration should be pointing to a configuration object in `:dns_config` to determine it's method of record management. - -For those using the global `DOMAIN` environment variable or global `:config.domain` key, this means records were not previously being managed by VMPooler (presumably managed via dynamic dns), so it's value should be moved to `:dns_configs::domain` with the value for `dns_class` for the config set to `dynamic-dns`. - -For example, the following < v3.x configuration: - -```yaml -:config: - domain: 'example.com' -``` - -becomes: - -```yaml -:dns_configs: - :example: - dns_class: dynamic-dns - domain: 'example.com' -``` - -Then any pools that should have records created via the dns config above should now reference the named dns config in the `dns_plugin` key: - -```yaml -:pools: - - name: 'debian-8-x86_64' - dns_plugin: 'example' -``` - -For those using the GCE provider, [vmpooler-provider-gce](https://github.com/puppetlabs/vmpooler-provider-gce), as of version 1.x the DNS management has been decoupled. See - ### v2.0.0 note As of version 2.0.0, all providers other than the dummy one are now separate gems. Historically the vSphere provider was included within VMPooler itself. That code has been moved to the [puppetlabs/vmpooler-provider-vsphere](https://github.com/puppetlabs/vmpooler-provider-vsphere) repository and the `vmpooler-provider-vsphere` gem. To migrate from VMPooler 1.x to 2.0 you will need to ensure that `vmpooler-provider-vsphere` is installed along side the `vmpooler` gem. See the [Provider API](docs/PROVIDER_API.md) docs for more information. diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..9e18dfd --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,26 @@ +# This Dockerfile is intended to be used with the +# docker-compose file in the same directory. + +FROM jruby:9.3-jdk + +ENV RACK_ENV=production + +RUN apt-get update -qq && \ + apt-get install -y --no-install-recommends make git && \ + apt-get clean autoclean && \ + apt-get autoremove -y && \ + rm -rf /var/lib/apt/lists/* + +COPY docker/docker-entrypoint.sh /usr/local/bin/ + +RUN chmod +x /usr/local/bin/docker-entrypoint.sh + +COPY docker/Gemfile* ./ + +COPY ./ ./vmpooler-source + +RUN gem install bundler && \ + bundle config set --local jobs 3 && \ + bundle install + +ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/docker/Gemfile b/docker/Gemfile new file mode 100644 index 0000000..a616bbc --- /dev/null +++ b/docker/Gemfile @@ -0,0 +1,5 @@ +source ENV['GEM_SOURCE'] || 'https://rubygems.org' + +gem 'vmpooler', path: './vmpooler-source' +gem 'vmpooler-provider-gce', git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git' +gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock new file mode 100644 index 0000000..e03d877 --- /dev/null +++ b/docker/Gemfile.lock @@ -0,0 +1,191 @@ +GIT + remote: https://github.com/puppetlabs/vmpooler-provider-gce.git + revision: 46b9c5aef06184f8a2bd0be6086ae2256b19020a + specs: + vmpooler-provider-gce (0.3.0) + google-apis-compute_v1 (~> 0.14) + google-cloud-dns (~> 0.35.1) + googleauth (>= 0.16.2, < 1.2.0) + +GIT + remote: https://github.com/puppetlabs/vmpooler-provider-vsphere.git + revision: a9662622d5574a7f9f6e97ff4c8bc82786982266 + specs: + vmpooler-provider-vsphere (1.5.0) + rbvmomi (>= 2.1, < 4.0) + +PATH + remote: vmpooler-source + specs: + vmpooler (2.4.0) + concurrent-ruby (~> 1.1) + connection_pool (~> 2.2) + deep_merge (~> 1.2) + net-ldap (~> 0.16) + opentelemetry-exporter-jaeger (= 0.20.1) + opentelemetry-instrumentation-concurrent_ruby (= 0.19.2) + opentelemetry-instrumentation-http_client (= 0.19.4) + opentelemetry-instrumentation-redis (= 0.21.3) + opentelemetry-instrumentation-sinatra (= 0.19.3) + opentelemetry-resource_detectors (= 0.19.1) + opentelemetry-sdk (~> 1.0, >= 1.0.2) + pickup (~> 0.0.11) + prometheus-client (~> 2.0) + puma (~> 5.0, >= 5.0.4) + rack (~> 2.2) + rake (~> 13.0) + redis (~> 4.1) + sinatra (~> 2.0) + spicy-proton (~> 2.1) + statsd-ruby (~> 1.4) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + bindata (2.4.10) + builder (3.2.4) + concurrent-ruby (1.1.10) + connection_pool (2.2.5) + declarative (0.0.20) + deep_merge (1.2.2) + faraday (2.3.0) + faraday-net_http (~> 2.0) + ruby2_keywords (>= 0.0.4) + faraday-net_http (2.0.3) + google-apis-compute_v1 (0.44.0) + google-apis-core (>= 0.7, < 2.a) + google-apis-core (0.7.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-dns_v1 (0.23.0) + google-apis-core (>= 0.7, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-dns (0.35.1) + google-apis-dns_v1 (~> 0.1) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + zonefile (~> 1.04) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.2.0) + googleauth (1.1.3) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + httpclient (2.8.3) + json (2.6.2-java) + jwt (2.4.1) + memoist (0.16.2) + mini_mime (1.1.2) + multi_json (1.15.0) + mustermann (2.0.2) + ruby2_keywords (~> 0.0.1) + net-ldap (0.17.1) + nio4r (2.5.8-java) + nokogiri (1.13.8-java) + racc (~> 1.4) + opentelemetry-api (1.0.2) + opentelemetry-common (0.19.6) + opentelemetry-api (~> 1.0) + opentelemetry-exporter-jaeger (0.20.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.2) + opentelemetry-sdk (~> 1.0) + thrift + opentelemetry-instrumentation-base (0.19.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-concurrent_ruby (0.19.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-http_client (0.19.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-redis (0.21.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-sinatra (0.19.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-registry (0.1.0) + opentelemetry-api (~> 1.0.1) + opentelemetry-resource_detectors (0.19.1) + google-cloud-env + opentelemetry-sdk + opentelemetry-sdk (1.1.0) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-registry (~> 0.1) + opentelemetry-semantic_conventions + opentelemetry-semantic_conventions (1.8.0) + opentelemetry-api (~> 1.0) + optimist (3.0.1) + os (1.1.4) + pickup (0.0.11) + prometheus-client (2.1.0) + public_suffix (4.0.7) + puma (5.6.4-java) + nio4r (~> 2.0) + racc (1.6.0-java) + rack (2.2.4) + rack-protection (2.2.2) + rack + rake (13.0.6) + rbvmomi (3.0.0) + builder (~> 3.2) + json (~> 2.3) + nokogiri (~> 1.10) + optimist (~> 3.0) + redis (4.7.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) + ruby2_keywords (0.0.5) + signet (0.17.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + sinatra (2.2.2) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.2) + tilt (~> 2.0) + spicy-proton (2.1.14) + bindata (~> 2.3) + statsd-ruby (1.5.0) + thrift (0.16.0) + tilt (2.0.11) + trailblazer-option (0.1.2) + uber (0.1.0) + webrick (1.7.0) + zonefile (1.06) + +PLATFORMS + universal-java-1.8 + +DEPENDENCIES + vmpooler! + vmpooler-provider-gce! + vmpooler-provider-vsphere! + +BUNDLED WITH + 2.3.18 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..af102bd --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,85 @@ +# For local development run with a dummy provider +version: '3.8' +services: + vmpooler-api: + build: + context: ../ + dockerfile: docker/Dockerfile + volumes: + - type: bind + source: ${PWD}/vmpooler.yaml + target: /etc/vmpooler/vmpooler.yaml + ports: + - "8080:4567" + networks: + - redis-net + environment: + - VMPOOLER_DEBUG=true # for use of dummy auth + - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml + - REDIS_SERVER=redislocal + - LOGFILE=/dev/null + - VMPOOLER_TRACING_ENABLED=true + - VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces + image: vmpooler-local + command: api + depends_on: + - redislocal + vmpooler-manager: + build: + context: ../ + dockerfile: docker/Dockerfile + volumes: + - type: bind + source: ${PWD}/vmpooler.yaml + target: /etc/vmpooler/vmpooler.yaml + ports: + - "8081:4567" + networks: + - redis-net + environment: + - VMPOOLER_DEBUG=true # for use of dummy auth + - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml + - REDIS_SERVER=redislocal + - LOGFILE=/dev/null + - JRUBY_OPTS=-Xinvokedynamic.yield=false + - VMPOOLER_TRACING_ENABLED=true + - VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces + image: vmpooler-local + command: manager + depends_on: + - redislocal + redislocal: + image: redis + # Uncomment this if you don't want the redis data to persist + #command: "redis-server --save '' --appendonly no" + ports: + - "6379:6379" + networks: + - redis-net + redis-commander: + container_name: redis-commander + hostname: redis-commander + image: rediscommander/redis-commander:latest + restart: always + environment: + - REDIS_HOSTS=local:redislocal:6379 + ports: + - "8079:8081" + networks: + - redis-net + depends_on: + - redislocal + jaeger-aio: + image: jaegertracing/all-in-one:1.18 + ports: + - "14250:14250" + - "8082:16686" + networks: + - redis-net + user: '1001' + read_only: true + cap_drop: + - ALL + +networks: + redis-net: diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh new file mode 100644 index 0000000..07d11de --- /dev/null +++ b/docker/docker-entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +set -- bundle exec vmpooler "$@" + +exec "$@" diff --git a/docker/update-gemfile-lock.sh b/docker/update-gemfile-lock.sh new file mode 100755 index 0000000..e756f73 --- /dev/null +++ b/docker/update-gemfile-lock.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +docker run -it --rm \ + -v $(pwd)/docker:/app \ + -v $(pwd):/app/vmpooler-source \ + $(grep ^FROM docker/Dockerfile |cut -d ' ' -f2) \ + /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make git && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"' +rmdir docker/vmpooler-source diff --git a/docs/API-v1.md b/docs/API-v1.md new file mode 100644 index 0000000..ee6fa26 --- /dev/null +++ b/docs/API-v1.md @@ -0,0 +1,936 @@ +# Table of contents +1. [API](#API) +2. [Token operations](#token) +3. [VM operations](#vmops) +4. [Add disks](#adddisks) +5. [VM snapshots](#vmsnapshots) +6. [Status and metrics](#statusmetrics) +7. [Pool configuration](#poolconfig) +8. [Ondemand VM provisioning](#ondemandvm) + +### API + +vmpooler provides a REST API for VM management. The following examples use `curl` for communication. + +#### Token operations + +Token-based authentication can be used when requesting or modifying VMs. The `/token` route can be used to create, query, or delete tokens. See the provided YAML configuration example, [vmpooler.yaml.example](vmpooler.yaml.example), for information on configuring an authentication store to use when performing token operations. + +##### GET /token + +Get a list of issued tokens. + +Return codes: +* 200 OK +* 401 when not authorized +* 404 when config:auth not found or other error + +``` +$ curl -u jdoe --url vmpooler.example.com/api/v1/token +Enter host password for user 'jdoe': +``` +```json +{ + "ok": true, + "utpg2i2xswor6h8ttjhu3d47z53yy47y": { + "created": "2015-04-28 19:17:47 -0700" + } +} +``` + +##### POST /token + +Generate a new authentication token. + +Return codes: +* 200 OK +* 401 when not authorized +* 404 when config:auth not found + +``` +$ curl -X POST -u jdoe --url vmpooler.example.com/api/v1/token +Enter host password for user 'jdoe': +``` +```json +{ + "ok": true, + "token": "utpg2i2xswor6h8ttjhu3d47z53yy47y" +} +``` + +##### GET /token/<token> + +Get information about an existing token (including associated VMs). + +Return codes: +* 200 OK +* 404 when config:auth or token not found + +``` +$ curl --url vmpooler.example.com/api/v1/token/utpg2i2xswor6h8ttjhu3d47z53yy47y +``` +```json +{ + "ok": true, + "utpg2i2xswor6h8ttjhu3d47z53yy47y": { + "user": "jdoe", + "created": "2015-04-28 19:17:47 -0700", + "last": "2015-11-04 12:28:37 -0700", + "vms": { + "running": [ + "dqs4914g2wjyy5w", + "hul7ib0ssr0f4o0" + ] + } + } +} +``` + +##### DELETE /token/<token> + +Delete an authentication token. + +Return codes: +* 200 OK +* 401 when not authorized +* 404 when config:auth not found + +``` +$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v1/token/utpg2i2xswor6h8ttjhu3d47z53yy47y +Enter host password for user 'jdoe': +``` +```json +{ + "ok": true +} +``` + +#### VM operations + +##### GET /vm + +Retrieve a list of available VM pools. + +Return codes: +* 200 OK + +``` +$ curl --url vmpooler.example.com/api/v1/vm +``` +```json +[ + "debian-7-i386", + "debian-7-x86_64" +] +``` + +##### POST /vm + +Useful for batch operations; post JSON (see format below), get back allocated VMs. + +If an authentication store is configured, an authentication token supplied via the `X-AUTH-TOKEN` HTTP header will modify a VM's default lifetime. See the provided YAML configuration example, [vmpooler.yaml.example](vmpooler.yaml.example), and the 'token operations' section above for more information. + +Return codes: +* 200 OK +* 404 when sending invalid JSON in the request body or requesting an invalid VM pool name +* 503 when the vm failed to allocate a vm, or the pool is empty + +``` +$ curl -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url vmpooler.example.com/api/v1/vm +``` +```json +{ + "ok": true, + "debian-7-i386": { + "hostname": [ + "o41xtodlvnvu5cw", + "khirruvwfjlmx3y" + ] + }, + "debian-7-x86_64": { + "hostname": "y91qbrpbfj6d13q" + }, + "domain": "example.com" +} +``` + +**NOTE: Returns either all requested VMs or no VMs.** + +##### POST /vm/<pool> + +Check-out a VM or VMs. + +Return codes: +* 200 OK +* 404 when sending invalid JSON in the request body or requesting an invalid VM pool name +* 503 when the vm failed to allocate a vm, or the pool is empty + +``` +$ curl -d --url vmpooler.example.com/api/v1/vm/debian-7-i386 +``` +```json +{ + "ok": true, + "debian-7-i386": { + "hostname": "fq6qlpjlsskycq6" + }, + "domain": "example.com" +} +``` + +Multiple VMs can be requested by using multiple query parameters in the URL: + +``` +$ curl -d --url vmpooler.example.com/api/v1/vm/debian-7-i386+debian-7-i386+debian-7-x86_64 +``` + +```json +{ + "ok": true, + "debian-7-i386": { + "hostname": [ + "sc0o4xqtodlul5w", + "4m4dkhqiufnjmxy" + ] + }, + "debian-7-x86_64": { + "hostname": "zb91y9qbrbf6d3q" + }, + "domain": "example.com" +} +``` + +**NOTE: Returns either all requested VMs or no VMs.** + +##### GET /vm/<hostname> + +Query metadata information for a checked-out VM. + +Return codes: +* 200 OK +* 404 when requesting an invalid VM hostname + +``` +$ curl --url vmpooler.example.com/api/v1/vm/pxpmtoonx7fiqg6 +``` +```json +{ + "ok": true, + "pxpmtoonx7fiqg6": { + "template": "centos-6-x86_64", + "lifetime": 12, + "running": 3, + "remaining": 9, + "state": "running", + "tags": { + "department": "engineering", + "user": "jdoe" + }, + "ip": "192.168.0.1", + "domain": "example.com", + "host": "host1.example.com", + "migrated": "true" + } +} +``` + +##### PUT /vm/<hostname> + +Modify a checked-out VM. + +The following are valid PUT parameters and their required data structures: + +parameter | description | required structure +--------- | ----------- | ------------------ +*lifetime* | VM TTL (in hours) | integer +*tags* | free-form VM tagging | hash + +Any modifications can be verified using the [GET /vm/<hostname>](#get-vmhostname) endpoint. + +If an authentication store is configured, an authentication token is required (via the `X-AUTH-TOKEN` HTTP header) to access this route. See the provided YAML configuration example, [vmpooler.yaml.example](vmpooler.yaml.example), and the 'token operations' section above for more information. + +Return codes: +* 200 OK +* 401 when you need an auth token +* 404 when requesting an invalid VM hostname +* 400 when supplied PUT parameters fail validation + +``` +$ curl -X PUT -d '{"lifetime":"2"}' --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6 +``` +```json +{ + "ok": true +} +``` + +``` +$ curl -X PUT -d '{"tags":{"department":"engineering","user":"jdoe"}}' --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6 +``` +```json +{ + "ok": true +} +``` + +##### DELETE /vm/<hostname> + +Schedule a checked-out VM for deletion. + +Return codes: +* 200 OK +* 401 when you need an auth token +* 404 when requesting an invalid VM hostname + +``` +$ curl -X DELETE --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6 +``` +```json +{ + "ok": true +} +``` + +#### Adding additional disk(s) + +##### POST /vm/<hostname>/disk/<size> + +Add an additional disk to a running VM. + +Return codes: +* 202 OK +* 401 when you need an auth token +* 404 when requesting an invalid VM hostname or size is not an integer + +```` +$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6/disk/8 +```` +````json +{ + "ok": true, + "fq6qlpjlsskycq6": { + "disk": "+8gb" + } +} +```` + +Provisioning and attaching disks can take a moment, but once the task completes it will be reflected in a `GET /vm/` query: + +```` +$ curl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6 +```` +````json +{ + "ok": true, + "fq6qlpjlsskycq6": { + "template": "debian-7-x86_64", + "lifetime": 2, + "running": 0.08, + "state": "running", + "disk": [ + "+8gb" + ], + "domain": "delivery.puppetlabs.net" + } +} + +```` + +#### VM snapshots + +##### POST /vm/<hostname>/snapshot + +Create a snapshot of a running VM. + +Return codes: +* 202 OK +* 401 when you need an auth token +* 404 when requesting an invalid VM hostname + +```` +$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6/snapshot +```` +````json +{ + "ok": true, + "fq6qlpjlsskycq6": { + "snapshot": "n4eb4kdtp7rwv4x158366vd9jhac8btq" + } +} +```` + +Snapshotting a live VM can take a moment, but once the snapshot task completes it will be reflected in a `GET /vm/` query: + +```` +$ curl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6 +```` +````json +{ + "ok": true, + "fq6qlpjlsskycq6": { + "template": "debian-7-x86_64", + "lifetime": 2, + "running": 0.08, + "state": "running", + "snapshots": [ + "n4eb4kdtp7rwv4x158366vd9jhac8btq" + ], + "domain": "delivery.puppetlabs.net" + } +} +```` + +##### POST /vm/<hostname>/snapshot/<snapshot> + +Revert a VM back to a snapshot. + +Return codes: +* 202 OK +* 401 when you need an auth token +* 404 when requesting an invalid VM hostname or snapshot is not valid + +```` +$ curl X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6/snapshot/n4eb4kdtp7rwv4x158366vd9jhac8btq +```` +````json +{ + "ok": true +} +```` + +#### Status and metrics + +##### GET /status + +A "live" status endpoint, representing the current state of the service. + +``` +$ curl --url vmpooler.example.com/api/v1/status +``` +```json +{ + "capacity": { + "current": 716, + "total": 717, + "percent": 99.9 + }, + "clone": { + "duration": { + "average": 8.8, + "min": 2.79, + "max": 69.76 + }, + "count": { + "total": 1779 + } + }, + "queue": { + "pending": 1, + "cloning": 0, + "booting": 1, + "ready": 716, + "running": 142, + "completed": 0, + "total": 859 + }, + "status": { + "ok": true, + "message": "Battle station fully armed and operational." + } +} +``` + +If there are empty pools, the "status" section will convey this: + +```json + "status": { + "ok": false, + "message": "Found 2 empty pools.", + "empty": [ + "centos-6-x86_64", + "debian-7-x86_64" + ] + } +``` + +The top level sections are: "capacity", "queue", "clone", "boot", "pools" and "status". +If the query parameter 'view' is provided, it will be used to select which top level +element to compute and return. Select them by specifying which one you want in a comma +separated list. +For example `vmpooler.example.com/api/v1/status?view=capacity,boot` + +##### GET /summary[?from=YYYY-MM-DD[&to=YYYY-MM-DD]] + +Returns a summary, or report, for the timespan between `from` and `to` (inclusive) +parameters. The response includes both an overall and daily view of tracked +metrics, such as boot and cloning durations. + +Any omitted query parameter will default to now/today. A request without any +parameters will result in the current day's summary. + +Return codes: +* 200 OK +* 400 Invalid date format or range + + +``` +$ curl --url vmpooler.example.com/api/v1/summary +``` +```json +{ + "boot": { + "duration": { + "average": 106.6, + "min": 83.09, + "max": 121.06, + "total": 639.36, + }, + "count": { + "average": 6, + "min": 6, + "max": 6, + "total": 6, + } + }, + "clone": { + "duration": { + "average": 4.6, + "min": 2.78, + "max": 8.1, + "total": 63.94, + }, + "count": { + "average": 14, + "min": 14, + "max": 14, + "total": 14, + } + }, + "tag": { + "department": { + "engineering": 14, + "help desk": 10, + "IT": 44, + "total": 68 + }, + "user": { + "arodgers": 54, + "cmatthews": 10, + "jnelson": 4, + "total": 68 + } + }, + "daily": [ + { + "date": "2015-03-11", + "boot": { + "duration": { + "average": 106.6, + "min": 83.09, + "max": 121.06, + "total": 639.36 + }, + "count": { + "total": 6 + } + }, + "clone": { + "duration": { + "average": 4.6, + "min": 2.78, + "max": 8.1, + "total": 63.94 + }, + "count": { + "total": 14 + } + }, + "tag": { + "department": { + "engineering": 14, + "help desk": 10, + "IT": 44, + "total": 68 + }, + "user": { + "arodgers": 54, + "cmatthews": 10, + "jnelson": 4, + "total": 68 + } + } + } + ] +} +``` + + +``` +$ curl -G -d 'from=2015-03-10' -d 'to=2015-03-11' --url vmpooler.example.com/api/v1/summary +``` +```json +{ + "boot": {...}, + "clone": {...}, + "daily": [ + { + "date": "2015-03-10", + "boot": { + "duration": { + "average": 0, + "min": 0, + "max": 0, + "total": 0 + }, + "count": { + "total": 0 + } + }, + "clone": { + "duration": { + "average": 0, + "min": 0, + "max": 0, + "total": 0 + }, + "count": { + "total": 0 + } + }, + "tag": { } + }, + { + "date": "2015-03-11", + "boot": { + "duration": { + "average": 106.6, + "min": 83.09, + "max": 121.06, + "total": 639.36 + }, + "count": { + "total": 6 + } + }, + "clone": { + "duration": { + "average": 4.6, + "min": 2.78, + "max": 8.1, + "total": 63.94 + }, + "count": { + "total": 14 + } + }, + "tag": { } + } + ] +} +``` + +You can also query only the specific top level section you want by including it after `summary/`. +The valid sections are "boot", "clone" or "tag" eg. `vmpooler.example.com/api/v1/summary/boot/`. +You can further drill-down the data by specifying the second level parameter to query eg +`vmpooler.example.com/api/v1/summary/tag/created_by` + +##### GET /poolstat?pool=FOO + +For parameter `pool`, containing a comma separated list of pool names to query, this endpoint returns +each of the pool's ready, max and alias information. It can be used to get a fast response for +the required pools instead of using the /status API endpoint + +Return codes +* 200 OK + +``` +$ curl https://vmpooler.example.com/api/v1/poolstat?pool=centos-6-x86_64 +``` +```json +{ + "pools": { + "centos-6-x86_64": { + "ready": 25, + "max": 25, + "alias": [ + "centos-6-64", + "centos-6-amd64" + ] + } + } +} +``` + +##### GET /totalrunning + +Fast endpoint to return the total number of VMs in a 'running' state + +Return codes +* 200 OK + +``` +$ curl https://vmpooler.example.com/api/v1/totalrunning +``` + +```json +{ + + "running": 362 + +} +``` + +#### Managing pool configuration via API + +##### GET /config + +Returns the running pool configuration + +Return codes +* 200 OK +* 400 No configuration found + +``` +$ curl https://vmpooler.example.com/api/v1/config +``` +```json +{ + "pool_configuration": [ + { + "name": "redhat-7-x86_64", + "template": "templates/redhat-7.2-x86_64-0.0.3", + "folder": "vmpooler/redhat-7-x86_64", + "datastore": "stor1", + "size": 1, + "datacenter": "dc1", + "provider": "vsphere", + "capacity": 1, + "major": "redhat", + "template_ready": true + } + ], + "status": { + "ok": true + } +} +``` + +Note: to enable poolsize and pooltemplate config endpoints it is necessary to set 'experimental_features: true' in your vmpooler configuration. A 405 is returned when you attempt to interact with these endpoints when this configuration option is not set. + +##### POST /config/poolsize + +Change pool size without having to restart the service. + +All pool template changes requested must be for pools that exist in the vmpooler configuration running, or a 404 code will be returned + +When a pool size is changed due to the configuration posted a 201 status will be returned. When the pool configuration is valid, but will not result in any changes, 200 is returned. + +Pool size configuration changes persist through application restarts, and take precedence over a pool size value configured in the pool configuration provided when the application starts. This persistence is dependent on redis. So, if the redis data is lost then the configuration updates revert to those provided at startup at the next application start. + +An authentication token is required in order to change pool configuration when authentication is configured. +Responses: +* 200 - No changes required +* 201 - Changes made on at least one pool with changes requested +* 400 - An invalid configuration was provided causing requested changes to fail +* 404 - An unknown error occurred +* 405 - The endpoint is disabled because experimental features are disabled +``` +$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url https://vmpooler.example.com/api/v1/config/poolsize +``` +```json +{ + "ok": true +} +``` + +##### DELETE /config/poolsize/<pool> + +Delete an overridden pool size. This results in the values from VMPooler's config being used. + +Return codes: +* 200 - when nothing was changed but no error occurred +* 201 - size reset successful +* 401 - when not authorized +* 404 - pool does not exist +* 405 - The endpoint is disabled because experimental features are disabled + +``` +$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v1/poolsize/almalinux-8-x86_64 +``` +```json +{ + "ok": true, + "pool_size_before_overrides": 2, + "pool_size_before_reset": 4 +} +``` + +##### POST /config/pooltemplate + +Change the template configured for a pool, and replenish the pool with instances built from the new template. + +All pool template changes requested must be for pools that exist in the vmpooler configuration running, or a 404 code will be returned + +When a pool template is changed due to the configuration posted a 201 status will be returned. When the pool configuration is valid, but will not result in any changes, 200 is returned. + +A pool template being updated will cause the following actions, which are logged in vmpooler.log: +* Destroy all instances for the pool template being updated that are in the ready and pending state +* Halt repopulating the pool while creating template deltas for the newly configured template +* Unblock pool population and let the pool replenish with instances based on the newly configured template + +Pool template changes persist through application restarts, and take precedence over a pool template configured in the pool configuration provided when the application starts. This persistence is dependent on redis. As a result, if the redis data is lost then the configuration values revert to those provided at startup at the next application start. + +An authentication token is required in order to change pool configuration when authentication is configured. + +Responses: +* 200 - No changes required +* 201 - Changes made on at least one pool with changes requested +* 400 - An invalid configuration was provided causing requested changes to fail +* 404 - An unknown error occurred +* 405 - The endpoint is disabled because experimental features are disabled +``` +$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"templates/debian-7-i386"}' --url https://vmpooler.example.com/api/v1/config/pooltemplate +``` +```json +{ + "ok": true +} +``` + +##### DELETE /config/pooltemplate/<pool> + +Delete an overridden pool template. This results in the values from VMPooler's config being used. + +Return codes: +* 200 - when nothing was changed but no error occurred +* 201 - template reset successful +* 401 - when not authorized +* 404 - pool does not exist +* 405 - The endpoint is disabled because experimental features are disabled + +``` +$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v1/pooltemplate/almalinux-8-x86_64 +``` +```json +{ + "ok": true, + "template_before_overrides": "templates/almalinux-8-x86_64-0.0.2", + "template_before_reset": "templates/almalinux-8-x86_64-0.0.3-beta" +} +``` + +##### POST /poolreset + +Clear all pending and ready instances in a pool, and deploy replacements + +All pool reset requests must be for pools that exist in the vmpooler configuration running, or a 404 code will be returned. + +When a pool reset is requested a 201 status will be returned. + +A pool reset will cause vmpooler manager to log that it has cleared ready and pending instances. + +For poolreset to be available it is necessary to enable experimental features. Additionally, the request must be performed with an authentication token when authentication is configured. + +Responses: +* 201 - Pool reset requested received +* 400 - An invalid configuration was provided causing requested changes to fail +* 404 - An unknown error occurred +* 405 - The endpoint is disabled because experimental features are disabled +``` +$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"1"}' --url https://vmpooler.example.com/api/v1/poolreset +``` +```json +{ + "ok": true +} +``` + +#### Ondemand VM operations + +Ondemand VM operations offer a user an option to directly request instances to be allocated for use. This can be very useful when supporting a wide range of images because idle instances can be eliminated. + +##### POST /ondemandvm + +All instance types requested must match a pool name or alias in the running application configuration, or a 404 code will be returned + +When a provisioning request is accepted the API will return an indication that the request is successful. You may then poll /ondemandvm to monitor request status. + +An authentication token is required in order to request instances on demand when authentication is configured. + +Responses: +* 201 - Provisioning request accepted +* 400 - Payload contains invalid JSON and cannot be parsed +* 401 - No auth token provided, or provided auth token is not valid, and auth is enabled +* 403 - Request exceeds the configured per pool maximum +* 404 - A pool was requested, which is not available in the running configuration, or an unknown error occurred. +* 409 - A request of the matching ID has already been created +``` +$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"4"}' --url https://vmpooler.example.com/api/v1/ondemandvm +``` +```json +{ + "ok": true, + "request_id": "e3ff6271-d201-4f31-a315-d17f4e15863a" +} +``` + +##### GET /ondemandvm + +Get the status of an ondemandvm request that has already been posted. + +When the request is ready the ready status will change to 'true'. + +The number of instances pending vs ready will be reflected in the API response. + +Responses: +* 200 - The API request was successful and the status is ok +* 202 - The request is not ready yet +* 404 - The request can not be found, or an unknown error occurred +``` +$ curl https://vmpooler.example.com/api/v1/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a +``` +```json +{ + "ok": true, + "request_id": "e3ff6271-d201-4f31-a315-d17f4e15863a", + "ready": false, + "debian-7-i386": { + "ready": "3", + "pending": "1" + } +} +``` +```json +{ + "ok": true, + "request_id": "e3ff6271-d201-4f31-a315-d17f4e15863a", + "ready": true, + "debian-7-i386": { + "hostname": [ + "vm1", + "vm2", + "vm3", + "vm4" + ] + } +} +``` + +##### DELETE /ondemandvm + +Delete a ondemand request + +Deleting a ondemand request will delete any instances created for the request and mark the backend data for expiration in two weeks. Any subsequent attempts to retrieve request data will indicate it has been deleted. + +Responses: +* 200 - The API request was sucessful. A message will indicate if the request has already been deleted. +* 401 - No auth token provided, or provided auth token is not valid, and auth is enabled +* 404 - The request can not be found, or an unknown error occurred. +``` +$ curl -X DELETE https://vmpooler.example.com/api/v1/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a +``` +```json +{ + "ok": true +} +``` diff --git a/docs/API-v3.md b/docs/API-v2.md similarity index 89% rename from docs/API-v3.md rename to docs/API-v2.md index ec4feaf..54a83a6 100644 --- a/docs/API-v3.md +++ b/docs/API-v2.md @@ -12,15 +12,6 @@ vmpooler provides a REST API for VM management. The following examples use `curl` for communication. -## Major change in V3 versus V2 - -The api/v1 and api/v2 endpoints have been removed. Additionally, the generic api endpoint that reroutes to a versioned endpoint has been removed. - -The api/v3 endpoint removes the deprecated "domain" key returned in some of the operations like getting a VM, etc. If there is a "domain" configured in the top level configuration or for a specific provider, -the hostname now returns an FQDN including that domain. That is to say, we can now have multiple, different domains for each pool instead of only a single domain for all pools, or a domain restricted to a particular provider. - -Clients using some of the direct API paths (without specifying api/v1 or api/v2) will now now need to specify the versioned endpoint (api/v3). - ## Major change in V2 versus V1 The api/v2 endpoint removes a separate "domain" key returned in some of the operations like getting a VM, etc. If there is a "domain" configured in the top level configuration or for a specific provider, @@ -50,7 +41,7 @@ Return codes: * 404 when config:auth not found or other error ``` -$ curl -u jdoe --url vmpooler.example.com/api/v3/token +$ curl -u jdoe --url vmpooler.example.com/api/v2/token Enter host password for user 'jdoe': ``` ```json @@ -72,7 +63,7 @@ Return codes: * 404 when config:auth not found ``` -$ curl -X POST -u jdoe --url vmpooler.example.com/api/v3/token +$ curl -X POST -u jdoe --url vmpooler.example.com/api/v2/token Enter host password for user 'jdoe': ``` ```json @@ -91,7 +82,7 @@ Return codes: * 404 when config:auth or token not found ``` -$ curl --url vmpooler.example.com/api/v3/token/utpg2i2xswor6h8ttjhu3d47z53yy47y +$ curl --url vmpooler.example.com/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y ``` ```json { @@ -120,7 +111,7 @@ Return codes: * 404 when config:auth not found ``` -$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v3/token/utpg2i2xswor6h8ttjhu3d47z53yy47y +$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y Enter host password for user 'jdoe': ``` ```json @@ -139,7 +130,7 @@ Return codes: * 200 OK ``` -$ curl --url vmpooler.example.com/api/v3/vm +$ curl --url vmpooler.example.com/api/v2/vm ``` ```json [ @@ -160,7 +151,7 @@ Return codes: * 503 when the vm failed to allocate a vm, or the pool is empty ``` -$ curl -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url vmpooler.example.com/api/v3/vm +$ curl -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url vmpooler.example.com/api/v2/vm ``` ```json { @@ -189,7 +180,7 @@ Return codes: * 503 when the vm failed to allocate a vm, or the pool is empty ``` -$ curl -d --url vmpooler.example.com/api/v3/vm/debian-7-i386 +$ curl -d --url vmpooler.example.com/api/v2/vm/debian-7-i386 ``` ```json { @@ -203,7 +194,7 @@ $ curl -d --url vmpooler.example.com/api/v3/vm/debian-7-i386 Multiple VMs can be requested by using multiple query parameters in the URL: ``` -$ curl -d --url vmpooler.example.com/api/v3/vm/debian-7-i386+debian-7-i386+debian-7-x86_64 +$ curl -d --url vmpooler.example.com/api/v2/vm/debian-7-i386+debian-7-i386+debian-7-x86_64 ``` ```json @@ -232,7 +223,7 @@ Return codes: * 404 when requesting an invalid VM hostname ``` -$ curl --url vmpooler.example.com/api/v3/vm/pxpmtoonx7fiqg6 +$ curl --url vmpooler.example.com/api/v2/vm/pxpmtoonx7fiqg6 ``` ```json { @@ -276,7 +267,7 @@ Return codes: * 400 when supplied PUT parameters fail validation ``` -$ curl -X PUT -d '{"lifetime":"2"}' --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6 +$ curl -X PUT -d '{"lifetime":"2"}' --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6 ``` ```json { @@ -285,7 +276,7 @@ $ curl -X PUT -d '{"lifetime":"2"}' --url vmpooler.example.com/api/v3/vm/fq6qlpj ``` ``` -$ curl -X PUT -d '{"tags":{"department":"engineering","user":"jdoe"}}' --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6 +$ curl -X PUT -d '{"tags":{"department":"engineering","user":"jdoe"}}' --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6 ``` ```json { @@ -303,7 +294,7 @@ Return codes: * 404 when requesting an invalid VM hostname ``` -$ curl -X DELETE --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6 +$ curl -X DELETE --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6 ``` ```json { @@ -323,7 +314,7 @@ Return codes: * 404 when requesting an invalid VM hostname or size is not an integer ```` -$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6/disk/8 +$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6/disk/8 ```` ````json { @@ -337,7 +328,7 @@ $ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.e Provisioning and attaching disks can take a moment, but once the task completes it will be reflected in a `GET /vm/` query: ```` -$ curl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6 +$ curl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6 ```` ````json { @@ -367,7 +358,7 @@ Return codes: * 404 when requesting an invalid VM hostname ```` -$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6/snapshot +$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6/snapshot ```` ````json { @@ -381,7 +372,7 @@ $ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.e Snapshotting a live VM can take a moment, but once the snapshot task completes it will be reflected in a `GET /vm/` query: ```` -$ curl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6 +$ curl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6 ```` ````json { @@ -408,7 +399,7 @@ Return codes: * 404 when requesting an invalid VM hostname or snapshot is not valid ```` -$ curl X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6/snapshot/n4eb4kdtp7rwv4x158366vd9jhac8btq +$ curl X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6/snapshot/n4eb4kdtp7rwv4x158366vd9jhac8btq ```` ````json { @@ -423,7 +414,7 @@ $ curl X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.ex A "live" status endpoint, representing the current state of the service. ``` -$ curl --url vmpooler.example.com/api/v3/status +$ curl --url vmpooler.example.com/api/v2/status ``` ```json { @@ -475,7 +466,7 @@ The top level sections are: "capacity", "queue", "clone", "boot", "pools" and "s If the query parameter 'view' is provided, it will be used to select which top level element to compute and return. Select them by specifying which one you want in a comma separated list. -For example `vmpooler.example.com/api/v3/status?view=capacity,boot` +For example `vmpooler.example.com/api/v2/status?view=capacity,boot` ##### GET /summary[?from=YYYY-MM-DD[&to=YYYY-MM-DD]] @@ -492,7 +483,7 @@ Return codes: ``` -$ curl --url vmpooler.example.com/api/v3/summary +$ curl --url vmpooler.example.com/api/v2/summary ``` ```json { @@ -584,7 +575,7 @@ $ curl --url vmpooler.example.com/api/v3/summary ``` -$ curl -G -d 'from=2015-03-10' -d 'to=2015-03-11' --url vmpooler.example.com/api/v3/summary +$ curl -G -d 'from=2015-03-10' -d 'to=2015-03-11' --url vmpooler.example.com/api/v2/summary ``` ```json { @@ -648,9 +639,9 @@ $ curl -G -d 'from=2015-03-10' -d 'to=2015-03-11' --url vmpooler.example.com/api ``` You can also query only the specific top level section you want by including it after `summary/`. -The valid sections are "boot", "clone" or "tag" eg. `vmpooler.example.com/api/v3/summary/boot/`. +The valid sections are "boot", "clone" or "tag" eg. `vmpooler.example.com/api/v2/summary/boot/`. You can further drill-down the data by specifying the second level parameter to query eg -`vmpooler.example.com/api/v3/summary/tag/created_by` +`vmpooler.example.com/api/v2/summary/tag/created_by` ##### GET /poolstat?pool=FOO @@ -662,7 +653,7 @@ Return codes * 200 OK ``` -$ curl https://vmpooler.example.com/api/v3/poolstat?pool=centos-6-x86_64 +$ curl https://vmpooler.example.com/api/v2/poolstat?pool=centos-6-x86_64 ``` ```json { @@ -687,7 +678,7 @@ Return codes * 200 OK ``` -$ curl https://vmpooler.example.com/api/v3/totalrunning +$ curl https://vmpooler.example.com/api/v2/totalrunning ``` ```json @@ -709,7 +700,7 @@ Return codes * 400 No configuration found ``` -$ curl https://vmpooler.example.com/api/v3/config +$ curl https://vmpooler.example.com/api/v2/config ``` ```json { @@ -753,7 +744,7 @@ Responses: * 404 - An unknown error occurred * 405 - The endpoint is disabled because experimental features are disabled ``` -$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url https://vmpooler.example.com/api/v3/config/poolsize +$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url https://vmpooler.example.com/api/v2/config/poolsize ``` ```json { @@ -773,7 +764,7 @@ Return codes: * 405 - The endpoint is disabled because experimental features are disabled ``` -$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v3/poolsize/almalinux-8-x86_64 +$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v2/poolsize/almalinux-8-x86_64 ``` ```json { @@ -807,7 +798,7 @@ Responses: * 404 - An unknown error occurred * 405 - The endpoint is disabled because experimental features are disabled ``` -$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"templates/debian-7-i386"}' --url https://vmpooler.example.com/api/v3/config/pooltemplate +$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"templates/debian-7-i386"}' --url https://vmpooler.example.com/api/v2/config/pooltemplate ``` ```json { @@ -827,7 +818,7 @@ Return codes: * 405 - The endpoint is disabled because experimental features are disabled ``` -$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v3/pooltemplate/almalinux-8-x86_64 +$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v2/pooltemplate/almalinux-8-x86_64 ``` ```json { @@ -855,7 +846,7 @@ Responses: * 404 - An unknown error occurred * 405 - The endpoint is disabled because experimental features are disabled ``` -$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"1"}' --url https://vmpooler.example.com/api/v3/poolreset +$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"1"}' --url https://vmpooler.example.com/api/v2/poolreset ``` ```json { @@ -883,7 +874,7 @@ Responses: * 404 - A pool was requested, which is not available in the running configuration, or an unknown error occurred. * 409 - A request of the matching ID has already been created ``` -$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"4"}' --url https://vmpooler.example.com/api/v3/ondemandvm +$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"4"}' --url https://vmpooler.example.com/api/v2/ondemandvm ``` ```json { @@ -905,7 +896,7 @@ Responses: * 202 - The request is not ready yet * 404 - The request can not be found, or an unknown error occurred ``` -$ curl https://vmpooler.example.com/api/v3/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a +$ curl https://vmpooler.example.com/api/v2/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a ``` ```json { @@ -945,7 +936,7 @@ Responses: * 401 - No auth token provided, or provided auth token is not valid, and auth is enabled * 404 - The request can not be found, or an unknown error occurred. ``` -$ curl -X DELETE https://vmpooler.example.com/api/v3/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a +$ curl -X DELETE https://vmpooler.example.com/api/v2/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a ``` ```json { diff --git a/docs/configuration.md b/docs/configuration.md index 560c328..1c34c72 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -19,6 +19,11 @@ Provide the entire configuration as a blob of yaml. Individual parameters passed Path to a the file to use when loading the vmpooler configuration. This is only evaluated if `VMPOOLER_CONFIG` has not been specified. +### DOMAIN + +This environment variable is to set the configuration config.domain +(optional) + ### REDIS\_SERVER The redis server to use for vmpooler. @@ -246,18 +251,6 @@ This can be a string providing a single DN. For multiple DNs please specify the The LDAP object-type used to designate a user object. (optional) -### LDAP\_SERVICE_ACCOUNT\_HASH - -A hash containing the following parameters for a service account to perform the -initial bind. After the initial bind, then a search query is performed using the -'base' and 'user_object', then re-binds as the returned user. - -- :user_dn: The full distinguished name (DN) of the service account used to bind. - -- :password: The password for the service account used to bind. - -(optional) - ### SITE\_NAME The name of your deployment. diff --git a/examples/vmpooler.yaml.dummy-example.aliasedpools b/examples/vmpooler.yaml.dummy-example.aliasedpools index 55bf9ff..efe0ce2 100644 --- a/examples/vmpooler.yaml.dummy-example.aliasedpools +++ b/examples/vmpooler.yaml.dummy-example.aliasedpools @@ -17,20 +17,15 @@ logfile: '/Users/samuel/workspace/vmpooler/vmpooler.log' task_limit: 10 timeout: 15 - timeout_notification: 5 vm_checktime: 1 vm_lifetime: 12 vm_lifetime_auth: 24 allowed_tags: - 'created_by' - 'project' + domain: 'example.com' prefix: 'poolvm-' -:dns_configs: - :example: - dns_class: dynamic-dns - domain: 'example.com' - :pools: - name: 'debian-7-i386' alias: [ 'debian-7-32' ] @@ -39,10 +34,8 @@ datastore: 'vmstorage' size: 5 timeout: 15 - timeout_notification: 5 ready_ttl: 1440 provider: dummy - dns_plugin: 'example' - name: 'debian-7-i386-stringalias' alias: 'debian-7-32-stringalias' template: 'Templates/debian-7-i386' @@ -50,10 +43,8 @@ datastore: 'vmstorage' size: 5 timeout: 15 - timeout_notification: 5 ready_ttl: 1440 provider: dummy - dns_plugin: 'example' - name: 'debian-7-x86_64' alias: [ 'debian-7-64', 'debian-7-amd64' ] template: 'Templates/debian-7-x86_64' @@ -61,20 +52,16 @@ datastore: 'vmstorage' size: 5 timeout: 15 - timeout_notification: 5 ready_ttl: 1440 provider: dummy - dns_plugin: 'example' - name: 'debian-7-i386-noalias' template: 'Templates/debian-7-i386' folder: 'Pooled VMs/debian-7-i386' datastore: 'vmstorage' size: 5 timeout: 15 - timeout_notification: 5 ready_ttl: 1440 provider: dummy - dns_plugin: 'example' - name: 'debian-7-x86_64-alias-otherpool-extended' alias: [ 'debian-7-x86_64' ] template: 'Templates/debian-7-x86_64' @@ -82,7 +69,6 @@ datastore: 'other-vmstorage' size: 5 timeout: 15 - timeout_notification: 5 ready_ttl: 1440 provider: dummy - dns_plugin: 'example' + diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb index 2fcde30..516843f 100644 --- a/lib/vmpooler.rb +++ b/lib/vmpooler.rb @@ -76,13 +76,9 @@ module Vmpooler parsed_config[:config]['prefix'] = ENV['PREFIX'] || parsed_config[:config]['prefix'] || '' parsed_config[:config]['logfile'] = ENV['LOGFILE'] if ENV['LOGFILE'] parsed_config[:config]['site_name'] = ENV['SITE_NAME'] if ENV['SITE_NAME'] - if !parsed_config[:config]['domain'].nil? || !ENV['DOMAIN'].nil? - puts '[!] [error] The "domain" config setting has been removed in v3. Please see the docs for migrating the domain config to use a dns plugin at https://github.com/puppetlabs/vmpooler/blob/main/README.md#migrating-to-v3' - exit 1 - end + parsed_config[:config]['domain'] = ENV['DOMAIN'] if ENV['DOMAIN'] parsed_config[:config]['clone_target'] = ENV['CLONE_TARGET'] if ENV['CLONE_TARGET'] parsed_config[:config]['timeout'] = string_to_int(ENV['TIMEOUT']) if ENV['TIMEOUT'] - parsed_config[:config]['timeout_notification'] = string_to_int(ENV['TIMEOUT_NOTIFICATION']) if ENV['TIMEOUT_NOTIFICATION'] parsed_config[:config]['vm_lifetime_auth'] = string_to_int(ENV['VM_LIFETIME_AUTH']) if ENV['VM_LIFETIME_AUTH'] parsed_config[:config]['max_tries'] = string_to_int(ENV['MAX_TRIES']) if ENV['MAX_TRIES'] parsed_config[:config]['retry_factor'] = string_to_int(ENV['RETRY_FACTOR']) if ENV['RETRY_FACTOR'] @@ -104,7 +100,7 @@ module Vmpooler parsed_config[:redis]['data_ttl'] = string_to_int(ENV['REDIS_DATA_TTL']) || parsed_config[:redis]['data_ttl'] || 168 parsed_config[:redis]['connection_pool_size'] = string_to_int(ENV['REDIS_CONNECTION_POOL_SIZE']) || parsed_config[:redis]['connection_pool_size'] || 10 parsed_config[:redis]['connection_pool_timeout'] = string_to_int(ENV['REDIS_CONNECTION_POOL_TIMEOUT']) || parsed_config[:redis]['connection_pool_timeout'] || 5 - parsed_config[:redis]['reconnect_attempts'] = string_array_to_array(ENV['REDIS_RECONNECT_ATTEMPTS']) || parsed_config[:redis]['reconnect_attempts'] || 10 + parsed_config[:redis]['reconnect_attempts'] = string_to_int(ENV['REDIS_RECONNECT_ATTEMPTS']) || parsed_config[:redis]['reconnect_attempts'] || 10 parsed_config[:statsd] = parsed_config[:statsd] || {} if ENV['STATSD_SERVER'] parsed_config[:statsd]['server'] = ENV['STATSD_SERVER'] if ENV['STATSD_SERVER'] @@ -210,13 +206,8 @@ module Vmpooler end def self.new_redis(host = 'localhost', port = nil, password = nil, redis_reconnect_attempts = 10) - Redis.new( - host: host, - port: port, - password: password, - reconnect_attempts: redis_reconnect_attempts, - connect_timeout: 300 - ) + Redis.new(host: host, port: port, password: password, reconnect_attempts: redis_reconnect_attempts, reconnect_delay: 1.5, + reconnect_delay_max: 10.0) end def self.pools(conf) @@ -241,13 +232,6 @@ module Vmpooler Integer(s) end - def self.string_array_to_array(s) - # Returns an array from an array like string - return if s.nil? - - JSON.parse(s) - end - def self.true?(obj) obj.to_s.downcase == 'true' end diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb index 3b0d9de..a7eea30 100644 --- a/lib/vmpooler/api.rb +++ b/lib/vmpooler/api.rb @@ -3,7 +3,7 @@ module Vmpooler class API < Sinatra::Base # Load API components - %w[helpers dashboard v3 request_logger healthcheck].each do |lib| + %w[helpers dashboard reroute v1 v2 request_logger healthcheck].each do |lib| require "vmpooler/api/#{lib}" end # Load dashboard components @@ -52,7 +52,9 @@ module Vmpooler use Vmpooler::Dashboard use Vmpooler::API::Dashboard - use Vmpooler::API::V3 + use Vmpooler::API::Reroute + use Vmpooler::API::V1 + use Vmpooler::API::V2 end # Get thee started O WebServer diff --git a/lib/vmpooler/api/helpers.rb b/lib/vmpooler/api/helpers.rb index 747640d..93d571b 100644 --- a/lib/vmpooler/api/helpers.rb +++ b/lib/vmpooler/api/helpers.rb @@ -1,13 +1,10 @@ # frozen_string_literal: true -require 'vmpooler/api/input_validator' - module Vmpooler class API module Helpers - include InputValidator def tracer @tracer ||= OpenTelemetry.tracer_provider.tracer('api', Vmpooler::VERSION) @@ -28,7 +25,7 @@ module Vmpooler def validate_token(backend) tracer.in_span("Vmpooler::API::Helpers.#{__method__}") do if valid_token?(backend) - backend.hset("vmpooler__token__#{request.env['HTTP_X_AUTH_TOKEN']}", 'last', Time.now.to_s) + backend.hset("vmpooler__token__#{request.env['HTTP_X_AUTH_TOKEN']}", 'last', Time.now) return true end @@ -71,7 +68,7 @@ module Vmpooler end end - def authenticate_ldap(port, host, encryption_hash, user_object, base, username_str, password_str, service_account_hash = nil) + def authenticate_ldap(port, host, encryption_hash, user_object, base, username_str, password_str) tracer.in_span( "Vmpooler::API::Helpers.#{__method__}", attributes: { @@ -82,14 +79,6 @@ module Vmpooler }, kind: :client ) do - if service_account_hash - username = service_account_hash[:user_dn] - password = service_account_hash[:password] - else - username = "#{user_object}=#{username_str},#{base}" - password = password_str - end - ldap = Net::LDAP.new( :host => host, :port => port, @@ -97,22 +86,12 @@ module Vmpooler :base => base, :auth => { :method => :simple, - :username => username, - :password => password + :username => "#{user_object}=#{username_str},#{base}", + :password => password_str } ) - if service_account_hash - return true if ldap.bind_as( - :base => base, - :filter => "(#{user_object}=#{username_str})", - :password => password_str - ) - elsif ldap.bind - return true - else - return false - end + return true if ldap.bind return false end @@ -137,7 +116,6 @@ module Vmpooler :method => :start_tls, :tls_options => { :ssl_version => 'TLSv1' } } - service_account_hash = auth[:ldap]['service_account_hash'] unless ldap_base.is_a? Array ldap_base = ldap_base.split @@ -156,8 +134,7 @@ module Vmpooler search_user_obj, search_base, username_str, - password_str, - service_account_hash + password_str ) return true if result end @@ -204,7 +181,8 @@ module Vmpooler /^\d{4}-\d{2}-\d{2}$/ === date_str end - def hostname_shorten(hostname) + # NOTE: domain is not needed here, so we should update the callers of this method + def hostname_shorten(hostname, domain=nil) hostname[/[^.]+/] end @@ -292,7 +270,6 @@ module Vmpooler def get_queue_metrics(pools, backend) tracer.in_span("Vmpooler::API::Helpers.#{__method__}") do queue = { - requested: 0, pending: 0, cloning: 0, booting: 0, @@ -302,35 +279,15 @@ module Vmpooler total: 0 } - # Use a single pipeline to fetch all queue counts at once for better performance - results = backend.pipelined do |pipeline| - # Order matters - we'll use indices to extract values - pools.each do |pool| - pipeline.scard("vmpooler__provisioning__request#{pool['name']}") # 0..n-1 - pipeline.scard("vmpooler__provisioning__processing#{pool['name']}") # n..2n-1 - pipeline.scard("vmpooler__odcreate__task#{pool['name']}") # 2n..3n-1 - pipeline.scard("vmpooler__pending__#{pool['name']}") # 3n..4n-1 - pipeline.scard("vmpooler__ready__#{pool['name']}") # 4n..5n-1 - pipeline.scard("vmpooler__running__#{pool['name']}") # 5n..6n-1 - pipeline.scard("vmpooler__completed__#{pool['name']}") # 6n..7n-1 - end - pipeline.get('vmpooler__tasks__clone') # 7n - pipeline.get('vmpooler__tasks__ondemandclone') # 7n+1 - end + queue[:pending] = get_total_across_pools_redis_scard(pools, 'vmpooler__pending__', backend) + queue[:ready] = get_total_across_pools_redis_scard(pools, 'vmpooler__ready__', backend) + queue[:running] = get_total_across_pools_redis_scard(pools, 'vmpooler__running__', backend) + queue[:completed] = get_total_across_pools_redis_scard(pools, 'vmpooler__completed__', backend) - n = pools.length - # Safely extract results with default to empty array if slice returns nil - queue[:requested] = (results[0...n] || []).sum(&:to_i) + - (results[n...(2 * n)] || []).sum(&:to_i) + - (results[(2 * n)...(3 * n)] || []).sum(&:to_i) - queue[:pending] = (results[(3 * n)...(4 * n)] || []).sum(&:to_i) - queue[:ready] = (results[(4 * n)...(5 * n)] || []).sum(&:to_i) - queue[:running] = (results[(5 * n)...(6 * n)] || []).sum(&:to_i) - queue[:completed] = (results[(6 * n)...(7 * n)] || []).sum(&:to_i) - queue[:cloning] = (results[7 * n] || 0).to_i + (results[7 * n + 1] || 0).to_i - queue[:booting] = queue[:pending].to_i - queue[:cloning].to_i - queue[:booting] = 0 if queue[:booting] < 0 - queue[:total] = queue[:requested] + queue[:pending].to_i + queue[:ready].to_i + queue[:running].to_i + queue[:completed].to_i + queue[:cloning] = backend.get('vmpooler__tasks__clone').to_i + backend.get('vmpooler__tasks__ondemandclone').to_i + queue[:booting] = queue[:pending].to_i - queue[:cloning].to_i + queue[:booting] = 0 if queue[:booting] < 0 + queue[:total] = queue[:pending].to_i + queue[:ready].to_i + queue[:running].to_i + queue[:completed].to_i queue end @@ -595,6 +552,18 @@ module Vmpooler end end end + + def vm_ready?(vm_name, domain = nil) + tracer.in_span("Vmpooler::API::Helpers.#{__method__}") do + begin + open_socket(vm_name, domain) + rescue StandardError => _e + return false + end + + true + end + end end end end diff --git a/lib/vmpooler/api/input_validator.rb b/lib/vmpooler/api/input_validator.rb deleted file mode 100644 index add4d6a..0000000 --- a/lib/vmpooler/api/input_validator.rb +++ /dev/null @@ -1,159 +0,0 @@ -# frozen_string_literal: true - -module Vmpooler - class API - # Input validation helpers to enhance security - module InputValidator - # Maximum lengths to prevent abuse - MAX_HOSTNAME_LENGTH = 253 - MAX_TAG_KEY_LENGTH = 50 - MAX_TAG_VALUE_LENGTH = 255 - MAX_REASON_LENGTH = 500 - MAX_POOL_NAME_LENGTH = 100 - MAX_TOKEN_LENGTH = 64 - - # Valid patterns - HOSTNAME_PATTERN = /\A[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?(\.[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)* \z/ix.freeze - POOL_NAME_PATTERN = /\A[a-zA-Z0-9_-]+\z/.freeze - TAG_KEY_PATTERN = /\A[a-zA-Z0-9_\-.]+\z/.freeze - TOKEN_PATTERN = /\A[a-zA-Z0-9\-_]+\z/.freeze - INTEGER_PATTERN = /\A\d+\z/.freeze - - class ValidationError < StandardError; end - - # Validate hostname format and length - def validate_hostname(hostname) - return error_response('Hostname is required') if hostname.nil? || hostname.empty? - return error_response('Hostname too long') if hostname.length > MAX_HOSTNAME_LENGTH - return error_response('Invalid hostname format') unless hostname.match?(HOSTNAME_PATTERN) - - true - end - - # Validate pool/template name - def validate_pool_name(pool_name) - return error_response('Pool name is required') if pool_name.nil? || pool_name.empty? - return error_response('Pool name too long') if pool_name.length > MAX_POOL_NAME_LENGTH - return error_response('Invalid pool name format') unless pool_name.match?(POOL_NAME_PATTERN) - - true - end - - # Validate tag key and value - def validate_tag(key, value) - return error_response('Tag key is required') if key.nil? || key.empty? - return error_response('Tag key too long') if key.length > MAX_TAG_KEY_LENGTH - return error_response('Invalid tag key format') unless key.match?(TAG_KEY_PATTERN) - - if value - return error_response('Tag value too long') if value.length > MAX_TAG_VALUE_LENGTH - - # Sanitize value to prevent injection attacks - sanitized_value = value.gsub(/[^\w\s\-.@:\/]/, '') - return error_response('Tag value contains invalid characters') if sanitized_value != value - end - - true - end - - # Validate token format - def validate_token_format(token) - return error_response('Token is required') if token.nil? || token.empty? - return error_response('Token too long') if token.length > MAX_TOKEN_LENGTH - return error_response('Invalid token format') unless token.match?(TOKEN_PATTERN) - - true - end - - # Validate integer parameter - def validate_integer(value, name = 'value', min: nil, max: nil) - return error_response("#{name} is required") if value.nil? - - value_str = value.to_s - return error_response("#{name} must be a valid integer") unless value_str.match?(INTEGER_PATTERN) - - int_value = value.to_i - return error_response("#{name} must be at least #{min}") if min && int_value < min - return error_response("#{name} must be at most #{max}") if max && int_value > max - - int_value - end - - # Validate VM request count - def validate_vm_count(count) - validated = validate_integer(count, 'VM count', min: 1, max: 100) - return validated if validated.is_a?(Hash) # error response - - validated - end - - # Validate disk size - def validate_disk_size(size) - validated = validate_integer(size, 'Disk size', min: 1, max: 2048) - return validated if validated.is_a?(Hash) # error response - - validated - end - - # Validate lifetime (TTL) in hours - def validate_lifetime(lifetime) - validated = validate_integer(lifetime, 'Lifetime', min: 1, max: 168) # max 1 week - return validated if validated.is_a?(Hash) # error response - - validated - end - - # Validate reason text - def validate_reason(reason) - return true if reason.nil? || reason.empty? - return error_response('Reason too long') if reason.length > MAX_REASON_LENGTH - - # Sanitize to prevent XSS/injection - sanitized = reason.gsub(/[<>"']/, '') - return error_response('Reason contains invalid characters') if sanitized != reason - - true - end - - # Sanitize JSON body to prevent injection - def sanitize_json_body(body) - return {} if body.nil? || body.empty? - - begin - parsed = JSON.parse(body) - return error_response('Request body must be a JSON object') unless parsed.is_a?(Hash) - - # Limit depth and size to prevent DoS - return error_response('Request body too complex') if json_depth(parsed) > 5 - return error_response('Request body too large') if body.length > 10_240 # 10KB max - - parsed - rescue JSON::ParserError => e - error_response("Invalid JSON: #{e.message}") - end - end - - # Check if validation result is an error - def validation_error?(result) - result.is_a?(Hash) && result['ok'] == false - end - - private - - def error_response(message) - { 'ok' => false, 'error' => message } - end - - def json_depth(obj, depth = 0) - return depth unless obj.is_a?(Hash) || obj.is_a?(Array) - return depth + 1 if obj.empty? - - if obj.is_a?(Hash) - depth + 1 + obj.values.map { |v| json_depth(v, 0) }.max - else - depth + 1 + obj.map { |v| json_depth(v, 0) }.max - end - end - end - end -end diff --git a/lib/vmpooler/api/rate_limiter.rb b/lib/vmpooler/api/rate_limiter.rb deleted file mode 100644 index 8ecfb62..0000000 --- a/lib/vmpooler/api/rate_limiter.rb +++ /dev/null @@ -1,116 +0,0 @@ -# frozen_string_literal: true - -module Vmpooler - class API - # Rate limiter middleware to protect against abuse - # Uses Redis to track request counts per IP and token - class RateLimiter - DEFAULT_LIMITS = { - global_per_ip: { limit: 100, period: 60 }, # 100 requests per minute per IP - authenticated: { limit: 500, period: 60 }, # 500 requests per minute with token - vm_creation: { limit: 20, period: 60 }, # 20 VM creations per minute - vm_deletion: { limit: 50, period: 60 } # 50 VM deletions per minute - }.freeze - - def initialize(app, redis, config = {}) - @app = app - @redis = redis - @config = DEFAULT_LIMITS.merge(config[:rate_limits] || {}) - @enabled = config.fetch(:rate_limiting_enabled, true) - end - - def call(env) - return @app.call(env) unless @enabled - - request = Rack::Request.new(env) - client_id = identify_client(request) - endpoint_type = classify_endpoint(request) - - # Check rate limits - return rate_limit_response(client_id, endpoint_type) if rate_limit_exceeded?(client_id, endpoint_type, request) - - # Track the request - increment_request_count(client_id, endpoint_type) - - @app.call(env) - end - - private - - def identify_client(request) - # Prioritize token-based identification for authenticated requests - token = request.env['HTTP_X_AUTH_TOKEN'] - return "token:#{token}" if token && !token.empty? - - # Fall back to IP address - ip = request.ip || request.env['REMOTE_ADDR'] || 'unknown' - "ip:#{ip}" - end - - def classify_endpoint(request) - path = request.path - method = request.request_method - - return :vm_creation if method == 'POST' && path.include?('/vm') - return :vm_deletion if method == 'DELETE' && path.include?('/vm') - return :authenticated if request.env['HTTP_X_AUTH_TOKEN'] - - :global_per_ip - end - - def rate_limit_exceeded?(client_id, endpoint_type, _request) - limit_config = @config[endpoint_type] || @config[:global_per_ip] - key = "vmpooler__ratelimit__#{endpoint_type}__#{client_id}" - - current_count = @redis.get(key).to_i - current_count >= limit_config[:limit] - rescue StandardError => e - # If Redis fails, allow the request through (fail open) - warn "Rate limiter Redis error: #{e.message}" - false - end - - def increment_request_count(client_id, endpoint_type) - limit_config = @config[endpoint_type] || @config[:global_per_ip] - key = "vmpooler__ratelimit__#{endpoint_type}__#{client_id}" - - @redis.pipelined do |pipeline| - pipeline.incr(key) - pipeline.expire(key, limit_config[:period]) - end - rescue StandardError => e - # Log error but don't fail the request - warn "Rate limiter increment error: #{e.message}" - end - - def rate_limit_response(client_id, endpoint_type) - limit_config = @config[endpoint_type] || @config[:global_per_ip] - key = "vmpooler__ratelimit__#{endpoint_type}__#{client_id}" - - begin - ttl = @redis.ttl(key) - rescue StandardError - ttl = limit_config[:period] - end - - headers = { - 'Content-Type' => 'application/json', - 'X-RateLimit-Limit' => limit_config[:limit].to_s, - 'X-RateLimit-Remaining' => '0', - 'X-RateLimit-Reset' => (Time.now.to_i + ttl).to_s, - 'Retry-After' => ttl.to_s - } - - body = JSON.pretty_generate({ - 'ok' => false, - 'error' => 'Rate limit exceeded', - 'limit' => limit_config[:limit], - 'period' => limit_config[:period], - 'retry_after' => ttl - }) - - [429, headers, [body]] - end - end - end -end diff --git a/lib/vmpooler/api/reroute.rb b/lib/vmpooler/api/reroute.rb new file mode 100644 index 0000000..a8c66fa --- /dev/null +++ b/lib/vmpooler/api/reroute.rb @@ -0,0 +1,89 @@ +# frozen_string_literal: true + +module Vmpooler + class API + class Reroute < Sinatra::Base + api_version = '1' + + get '/status/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called /status/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/status") + end + + get '/summary/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called /summary/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/summary") + end + + get '/summary/:route/?:key?/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called /summary/:route/?:key?/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/summary/#{params[:route]}/#{params[:key]}") + end + + get '/token/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called /token/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/token") + end + + post '/token/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /token/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/token") + end + + get '/token/:token/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called /token/:token/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/token/#{params[:token]}") + end + + delete '/token/:token/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called delete /token/:token/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/token/#{params[:token]}") + end + + get '/vm/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called /vm? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm") + end + + post '/vm/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /vm? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm") + end + + post '/vm/:template/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /vm/:template/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:template]}") + end + + get '/vm/:hostname/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called /vm/:hostname/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}") + end + + delete '/vm/:hostname/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called delete /vm/:hostname/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}") + end + + put '/vm/:hostname/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called put /vm/:hostname/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}") + end + + post '/vm/:hostname/snapshot/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /vm/:hostname/snapshot/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}/snapshot") + end + + post '/vm/:hostname/snapshot/:snapshot/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /vm/:hostname/snapshot/:snapshot/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}/snapshot/#{params[:snapshot]}") + end + + put '/vm/:hostname/disk/:size/?' do + puts "DEPRECATION WARNING a client (#{request.user_agent}) called put /vm/:hostname/disk/:size/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance" + call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}/disk/#{params[:size]}") + end + end + end +end diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb new file mode 100644 index 0000000..c6e7d9b --- /dev/null +++ b/lib/vmpooler/api/v1.rb @@ -0,0 +1,1757 @@ +# frozen_string_literal: true + +require 'vmpooler/util/parsing' + +module Vmpooler + class API + class V1 < Sinatra::Base + api_version = '1' + api_prefix = "/api/v#{api_version}" + + helpers do + include Vmpooler::API::Helpers + end + + def backend + Vmpooler::API.settings.redis + end + + def metrics + Vmpooler::API.settings.metrics + end + + def config + Vmpooler::API.settings.config[:config] + end + + def full_config + Vmpooler::API.settings.config + end + + def pools + Vmpooler::API.settings.config[:pools] + end + + def pools_at_startup + Vmpooler::API.settings.config[:pools_at_startup] + end + + def pool_exists?(template) + Vmpooler::API.settings.config[:pool_names].include?(template) + end + + def need_auth! + validate_auth(backend) + end + + def need_token! + validate_token(backend) + end + + def checkoutlock + Vmpooler::API.settings.checkoutlock + end + + def get_template_aliases(template) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + result = [] + aliases = Vmpooler::API.settings.config[:alias] + if aliases + result += aliases[template] if aliases[template].is_a?(Array) + template_backends << aliases[template] if aliases[template].is_a?(String) + end + result + end + end + + def get_pool_weights(template_backends) + pool_index = pool_index(pools) + weighted_pools = {} + template_backends.each do |t| + next unless pool_index.key? t + + index = pool_index[t] + clone_target = pools[index]['clone_target'] || config['clone_target'] + next unless config.key?('backend_weight') + + weight = config['backend_weight'][clone_target] + if weight + weighted_pools[t] = weight + end + end + weighted_pools + end + + def count_selection(selection) + result = {} + selection.uniq.each do |poolname| + result[poolname] = selection.count(poolname) + end + result + end + + def evaluate_template_aliases(template, count) + template_backends = [] + template_backends << template if backend.sismember('vmpooler__pools', template) + selection = [] + aliases = get_template_aliases(template) + if aliases + template_backends += aliases + weighted_pools = get_pool_weights(template_backends) + + if weighted_pools.count > 1 && weighted_pools.count == template_backends.count + pickup = Pickup.new(weighted_pools) + count.to_i.times do + selection << pickup.pick + end + else + count.to_i.times do + selection << template_backends.sample + end + end + end + + count_selection(selection) + end + + def fetch_single_vm(template) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + template_backends = [template] + aliases = Vmpooler::API.settings.config[:alias] + if aliases + template_backends += aliases[template] if aliases[template].is_a?(Array) + template_backends << aliases[template] if aliases[template].is_a?(String) + pool_index = pool_index(pools) + weighted_pools = {} + template_backends.each do |t| + next unless pool_index.key? t + + index = pool_index[t] + clone_target = pools[index]['clone_target'] || config['clone_target'] + next unless config.key?('backend_weight') + + weight = config['backend_weight'][clone_target] + if weight + weighted_pools[t] = weight + end + end + + if weighted_pools.count == template_backends.count + pickup = Pickup.new(weighted_pools) + selection = pickup.pick + template_backends.delete(selection) + template_backends.unshift(selection) + else + first = template_backends.sample + template_backends.delete(first) + template_backends.unshift(first) + end + end + + checkoutlock.synchronize do + template_backends.each do |template_backend| + vms = backend.smembers("vmpooler__ready__#{template_backend}") + next if vms.empty? + + vms.reverse.each do |vm| + ready = vm_ready?(vm, config['domain']) + if ready + smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm) + if smoved + return [vm, template_backend, template] + else + metrics.increment("checkout.smove.failed.#{template_backend}") + return [nil, nil, nil] + end + else + backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__completed__#{template_backend}", vm) + metrics.increment("checkout.nonresponsive.#{template_backend}") + end + end + end + [nil, nil, nil] + end + end + end + + def return_vm_to_ready_state(template, vm) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + backend.srem("vmpooler__migrating__#{template}", vm) + backend.hdel("vmpooler__active__#{template}", vm) + backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user') + backend.smove("vmpooler__running__#{template}", "vmpooler__ready__#{template}", vm) + end + end + + def account_for_starting_vm(template, vm) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span| + user = backend.hget("vmpooler__token__#{request.env['HTTP_X_AUTH_TOKEN']}", 'user') + span.set_attribute('enduser.id', user) + has_token_result = has_token? + backend.sadd("vmpooler__migrating__#{template}", vm) + backend.hset("vmpooler__active__#{template}", vm, Time.now) + backend.hset("vmpooler__vm__#{vm}", 'checkout', Time.now) + + if Vmpooler::API.settings.config[:auth] and has_token_result + backend.hset("vmpooler__vm__#{vm}", 'token:token', request.env['HTTP_X_AUTH_TOKEN']) + backend.hset("vmpooler__vm__#{vm}", 'token:user', user) + + if config['vm_lifetime_auth'].to_i > 0 + backend.hset("vmpooler__vm__#{vm}", 'lifetime', config['vm_lifetime_auth'].to_i) + end + end + end + end + + def update_result_hosts(result, template, vm) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + result[template] ||= {} + if result[template]['hostname'] + result[template]['hostname'] = Array(result[template]['hostname']) + result[template]['hostname'].push(vm) + else + result[template]['hostname'] = vm + end + end + end + + def atomically_allocate_vms(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span| + result = { 'ok' => false } + failed = false + vms = [] + + validate_token(backend) if Vmpooler::API.settings.config[:auth] and has_token? + + payload.each do |requested, count| + count.to_i.times do |_i| + vmname, vmpool, vmtemplate = fetch_single_vm(requested) + if vmname + account_for_starting_vm(vmpool, vmname) + vms << [vmpool, vmname, vmtemplate] + metrics.increment("checkout.success.#{vmpool}") + update_user_metrics('allocate', vmname) if Vmpooler::API.settings.config[:config]['usage_stats'] + else + failed = true + metrics.increment("checkout.empty.#{requested}") + break + end + end + end + + if failed + vms.each do |(vmpool, vmname, _vmtemplate)| + return_vm_to_ready_state(vmpool, vmname) + end + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V1.atomically_allocate_vms', + 'error.message' => '503 due to failing to allocate one or more vms' + }) + status 503 + else + vm_names = [] + vms.each do |(_vmpool, vmname, vmtemplate)| + update_result_hosts(result, vmtemplate, vmname) + vm_names.append(vmname) + end + + span.set_attribute('vmpooler.vm_names', vm_names.join(',')) unless vm_names.empty? + + result['ok'] = true + result['domain'] = config['domain'] if config['domain'] + end + + result + end + end + + def component_to_test(match, labels_string) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + return if labels_string.nil? + + labels_string_parts = labels_string.split(',') + labels_string_parts.each do |part| + key, value = part.split('=') + next if value.nil? + return value if key == match + end + 'none' + end + end + + def update_user_metrics(operation, vmname) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span| + begin + backend.multi + backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url') + backend.hget("vmpooler__vm__#{vmname}", 'token:user') + backend.hget("vmpooler__vm__#{vmname}", 'template') + jenkins_build_url, user, poolname = backend.exec + poolname = poolname.gsub('.', '_') + + if user + user = user.gsub('.', '_') + else + user = 'unauthenticated' + end + metrics.increment("user.#{user}.#{operation}.#{poolname}") + + if jenkins_build_url + if jenkins_build_url.include? 'litmus' + # Very simple filter for Litmus jobs - just count them coming through for the moment. + metrics.increment("usage_litmus.#{user}.#{operation}.#{poolname}") + else + url_parts = jenkins_build_url.split('/')[2..-1] + jenkins_instance = url_parts[0].gsub('.', '_') + value_stream_parts = url_parts[2].split('_') + value_stream_parts = value_stream_parts.map { |s| s.gsub('.', '_') } + value_stream = value_stream_parts.shift + branch = value_stream_parts.pop + project = value_stream_parts.shift + job_name = value_stream_parts.join('_') + build_metadata_parts = url_parts[3] + component_to_test = component_to_test('RMM_COMPONENT_TO_TEST_NAME', build_metadata_parts) + + metrics.increment("usage_jenkins_instance.#{jenkins_instance}.#{value_stream}.#{operation}.#{poolname}") + metrics.increment("usage_branch_project.#{branch}.#{project}.#{operation}.#{poolname}") + metrics.increment("usage_job_component.#{job_name}.#{component_to_test}.#{operation}.#{poolname}") + end + end + rescue StandardError => e + puts 'd', "[!] [#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}" + span.record_exception(e) + span.status = OpenTelemetry::Trace::Status.error(e.to_s) + span.add_event('log', attributes: { + 'log.severity' => 'debug', + 'log.message' => "[#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}" + }) + end + end + end + + def reset_pool_size(poolname) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + result = { 'ok' => false } + + pool_index = pool_index(pools) + + pools_updated = 0 + sync_pool_sizes + + pool_size_now = pools[pool_index[poolname]]['size'].to_i + pool_size_original = pools_at_startup[pool_index[poolname]]['size'].to_i + result['pool_size_before_reset'] = pool_size_now + result['pool_size_before_overrides'] = pool_size_original + + unless pool_size_now == pool_size_original + pools[pool_index[poolname]]['size'] = pool_size_original + backend.hdel('vmpooler__config__poolsize', poolname) + backend.sadd('vmpooler__pool__undo_size_override', poolname) + pools_updated += 1 + status 201 + end + + status 200 unless pools_updated > 0 + result['ok'] = true + result + end + end + + def update_pool_size(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + result = { 'ok' => false } + + pool_index = pool_index(pools) + pools_updated = 0 + sync_pool_sizes + + payload.each do |poolname, size| + unless pools[pool_index[poolname]]['size'] == size.to_i + pools[pool_index[poolname]]['size'] = size.to_i + backend.hset('vmpooler__config__poolsize', poolname, size) + pools_updated += 1 + status 201 + end + end + status 200 unless pools_updated > 0 + result['ok'] = true + result + end + end + + def reset_pool_template(poolname) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + result = { 'ok' => false } + + pool_index_live = pool_index(pools) + pool_index_original = pool_index(pools_at_startup) + + pools_updated = 0 + sync_pool_templates + + template_now = pools[pool_index_live[poolname]]['template'] + template_original = pools_at_startup[pool_index_original[poolname]]['template'] + result['template_before_reset'] = template_now + result['template_before_overrides'] = template_original + + unless template_now == template_original + pools[pool_index_live[poolname]]['template'] = template_original + backend.hdel('vmpooler__config__template', poolname) + backend.sadd('vmpooler__pool__undo_template_override', poolname) + pools_updated += 1 + status 201 + end + + status 200 unless pools_updated > 0 + result['ok'] = true + result + end + end + + def update_pool_template(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + result = { 'ok' => false } + + pool_index = pool_index(pools) + pools_updated = 0 + sync_pool_templates + + payload.each do |poolname, template| + unless pools[pool_index[poolname]]['template'] == template + pools[pool_index[poolname]]['template'] = template + backend.hset('vmpooler__config__template', poolname, template) + pools_updated += 1 + status 201 + end + end + status 200 unless pools_updated > 0 + result['ok'] = true + result + end + end + + def reset_pool(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + result = { 'ok' => false } + + payload.each do |poolname, _count| + backend.sadd('vmpooler__poolreset', poolname) + end + status 201 + result['ok'] = true + result + end + end + + def update_clone_target(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + result = { 'ok' => false } + + pool_index = pool_index(pools) + pools_updated = 0 + sync_clone_targets + + payload.each do |poolname, clone_target| + unless pools[pool_index[poolname]]['clone_target'] == clone_target + pools[pool_index[poolname]]['clone_target'] = clone_target + backend.hset('vmpooler__config__clone_target', poolname, clone_target) + pools_updated += 1 + status 201 + end + end + status 200 unless pools_updated > 0 + result['ok'] = true + result + end + end + + def sync_pool_templates + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + pool_index = pool_index(pools) + template_configs = backend.hgetall('vmpooler__config__template') + template_configs&.each do |poolname, template| + next unless pool_index.include? poolname + + pools[pool_index[poolname]]['template'] = template + end + end + end + + def sync_pool_sizes + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + pool_index = pool_index(pools) + poolsize_configs = backend.hgetall('vmpooler__config__poolsize') + poolsize_configs&.each do |poolname, size| + next unless pool_index.include? poolname + + pools[pool_index[poolname]]['size'] = size.to_i + end + end + end + + def sync_clone_targets + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + pool_index = pool_index(pools) + clone_target_configs = backend.hgetall('vmpooler__config__clone_target') + clone_target_configs&.each do |poolname, clone_target| + next unless pool_index.include? poolname + + pools[pool_index[poolname]]['clone_target'] = clone_target + end + end + end + + def too_many_requested?(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + payload&.each do |poolname, count| + next unless count.to_i > config['max_ondemand_instances_per_request'] + + metrics.increment("ondemandrequest_fail.toomanyrequests.#{poolname}") + return true + end + false + end + end + + def generate_ondemand_request(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span| + result = { 'ok': false } + + requested_instances = payload.reject { |k, _v| k == 'request_id' } + if too_many_requested?(requested_instances) + e_message = "requested amount of instances exceeds the maximum #{config['max_ondemand_instances_per_request']}" + result['message'] = e_message + status 403 + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V1.generate_ondemand_request', + 'error.message' => "403 due to #{e_message}" + }) + return result + end + + score = Time.now.to_i + request_id = payload['request_id'] + request_id ||= generate_request_id + result['request_id'] = request_id + span.set_attribute('vmpooler.request_id', request_id) + + if backend.exists?("vmpooler__odrequest__#{request_id}") + e_message = "request_id '#{request_id}' has already been created" + result['message'] = e_message + status 409 + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V1.generate_ondemand_request', + 'error.message' => "409 due to #{e_message}" + }) + metrics.increment('ondemandrequest_generate.duplicaterequests') + return result + end + + status 201 + + platforms_with_aliases = [] + requested_instances.each do |poolname, count| + selection = evaluate_template_aliases(poolname, count) + selection.map { |selected_pool, selected_pool_count| platforms_with_aliases << "#{poolname}:#{selected_pool}:#{selected_pool_count}" } + end + platforms_string = platforms_with_aliases.join(',') + + return result unless backend.zadd('vmpooler__provisioning__request', score, request_id) + + backend.hset("vmpooler__odrequest__#{request_id}", 'requested', platforms_string) + if Vmpooler::API.settings.config[:auth] and has_token? + token_token = request.env['HTTP_X_AUTH_TOKEN'] + token_user = backend.hget("vmpooler__token__#{token_token}", 'user') + backend.hset("vmpooler__odrequest__#{request_id}", 'token:token', token_token) + backend.hset("vmpooler__odrequest__#{request_id}", 'token:user', token_user) + span.set_attribute('enduser.id', token_user) + end + + result['domain'] = config['domain'] if config['domain'] + result[:ok] = true + metrics.increment('ondemandrequest_generate.success') + result + end + end + + def generate_request_id + SecureRandom.uuid + end + + get '/' do + sync_pool_sizes + redirect to('/dashboard/') + end + + # Provide run-time statistics + # + # Example: + # + # { + # "boot": { + # "duration": { + # "average": 163.6, + # "min": 65.49, + # "max": 830.07, + # "total": 247744.71000000002 + # }, + # "count": { + # "total": 1514 + # } + # }, + # "capacity": { + # "current": 968, + # "total": 975, + # "percent": 99.3 + # }, + # "clone": { + # "duration": { + # "average": 17.0, + # "min": 4.66, + # "max": 637.96, + # "total": 25634.15 + # }, + # "count": { + # "total": 1507 + # } + # }, + # "queue": { + # "pending": 12, + # "cloning": 0, + # "booting": 12, + # "ready": 968, + # "running": 367, + # "completed": 0, + # "total": 1347 + # }, + # "pools": { + # "ready": 100, + # "running": 120, + # "pending": 5, + # "max": 250, + # } + # "status": { + # "ok": true, + # "message": "Battle station fully armed and operational.", + # "empty": [ # NOTE: would not have 'ok: true' w/ "empty" pools + # "redhat-7-x86_64", + # "ubuntu-1404-i386" + # ], + # "uptime": 179585.9 + # } + # + # If the query parameter 'view' is provided, it will be used to select which top level + # element to compute and return. Select them by specifying them in a comma separated list. + # For example /status?view=capacity,boot + # would return only the "capacity" and "boot" statistics. "status" is always returned + + get "#{api_prefix}/status/?" do + content_type :json + + if params[:view] + views = params[:view].split(",") + end + + result = { + status: { + ok: true, + message: 'Battle station fully armed and operational.' + } + } + + sync_pool_sizes + + result[:capacity] = get_capacity_metrics(pools, backend) unless views and not views.include?("capacity") + result[:queue] = get_queue_metrics(pools, backend) unless views and not views.include?("queue") + result[:clone] = get_task_metrics(backend, 'clone', Date.today.to_s) unless views and not views.include?("clone") + result[:boot] = get_task_metrics(backend, 'boot', Date.today.to_s) unless views and not views.include?("boot") + + # Check for empty pools + result[:pools] = {} unless views and not views.include?("pools") + ready_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__ready__', backend) + running_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__running__', backend) + pending_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__pending__', backend) + lastBoot_hash = get_list_across_pools_redis_hget(pools, 'vmpooler__lastboot', backend) + + unless views and not views.include?("pools") + pools.each do |pool| + # REMIND: move this out of the API and into the back-end + ready = ready_hash[pool['name']] + running = running_hash[pool['name']] + pending = pending_hash[pool['name']] + max = pool['size'] + lastBoot = lastBoot_hash[pool['name']] + aka = pool['alias'] + + result[:pools][pool['name']] = { + ready: ready, + running: running, + pending: pending, + max: max, + lastBoot: lastBoot + } + + if aka + result[:pools][pool['name']][:alias] = aka + end + + # for backwards compatibility, include separate "empty" stats in "status" block + if ready == 0 && max != 0 + result[:status][:empty] ||= [] + result[:status][:empty].push(pool['name']) + + result[:status][:ok] = false + result[:status][:message] = "Found #{result[:status][:empty].length} empty pools." + end + end + end + + result[:status][:uptime] = (Time.now - Vmpooler::API.settings.config[:uptime]).round(1) if Vmpooler::API.settings.config[:uptime] + + JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }]) + end + + # request statistics for specific pools by passing parameter 'pool' + # with a coma separated list of pools we want to query ?pool=ABC,DEF + # returns the ready, max numbers and the aliases (if set) + get "#{api_prefix}/poolstat/?" do + content_type :json + + result = {} + + poolscopy = [] + + if params[:pool] + subpool = params[:pool].split(",") + poolscopy = pools.select do |p| + if subpool.include?(p['name']) + true + elsif !p['alias'].nil? + if p['alias'].instance_of?(Array) + (p['alias'] & subpool).any? + elsif p['alias'].instance_of?(String) + subpool.include?(p['alias']) + end + end + end + end + + result[:pools] = {} + + poolscopy.each do |pool| + result[:pools][pool['name']] = {} + + max = pool['size'] + aka = pool['alias'] + + result[:pools][pool['name']][:max] = max + + if aka + result[:pools][pool['name']][:alias] = aka + end + end + + ready_hash = get_list_across_pools_redis_scard(poolscopy, 'vmpooler__ready__', backend) + + ready_hash.each { |k, v| result[:pools][k][:ready] = v } + + JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }]) + end + + # requests the total number of running VMs + get "#{api_prefix}/totalrunning/?" do + content_type :json + queue = { + running: 0 + } + + queue[:running] = get_total_across_pools_redis_scard(pools, 'vmpooler__running__', backend) + + JSON.pretty_generate(queue) + end + + get "#{api_prefix}/summary/?" do + content_type :json + + result = { + daily: [] + } + + from_param = params[:from] || Date.today.to_s + to_param = params[:to] || Date.today.to_s + + # Validate date formats + [from_param, to_param].each do |param| + if !validate_date_str(param.to_s) + halt 400, "Invalid date format '#{param}', must match YYYY-MM-DD." + end + end + + from_date, to_date = Date.parse(from_param), Date.parse(to_param) + + if to_date < from_date + halt 400, 'Date range is invalid, \'to\' cannot come before \'from\'.' + elsif from_date > Date.today + halt 400, 'Date range is invalid, \'from\' must be in the past.' + end + + boot = get_task_summary(backend, 'boot', from_date, to_date, :bypool => true) + clone = get_task_summary(backend, 'clone', from_date, to_date, :bypool => true) + tag = get_tag_summary(backend, from_date, to_date) + + result[:boot] = boot[:boot] + result[:clone] = clone[:clone] + result[:tag] = tag[:tag] + + daily = {} + + boot[:daily].each do |day| + daily[day[:date]] ||= {} + daily[day[:date]][:boot] = day[:boot] + end + + clone[:daily].each do |day| + daily[day[:date]] ||= {} + daily[day[:date]][:clone] = day[:clone] + end + + tag[:daily].each do |day| + daily[day[:date]] ||= {} + daily[day[:date]][:tag] = day[:tag] + end + + daily.each_key do |day| + result[:daily].push({ + date: day, + boot: daily[day][:boot], + clone: daily[day][:clone], + tag: daily[day][:tag] + }) + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/summary/:route/?:key?/?" do + content_type :json + + result = {} + + from_param = params[:from] || Date.today.to_s + to_param = params[:to] || Date.today.to_s + + # Validate date formats + [from_param, to_param].each do |param| + if !validate_date_str(param.to_s) + halt 400, "Invalid date format '#{param}', must match YYYY-MM-DD." + end + end + + from_date, to_date = Date.parse(from_param), Date.parse(to_param) + + if to_date < from_date + halt 400, 'Date range is invalid, \'to\' cannot come before \'from\'.' + elsif from_date > Date.today + halt 400, 'Date range is invalid, \'from\' must be in the past.' + end + + case params[:route] + when 'boot' + result = get_task_summary(backend, 'boot', from_date, to_date, :bypool => true, :only => params[:key]) + when 'clone' + result = get_task_summary(backend, 'clone', from_date, to_date, :bypool => true, :only => params[:key]) + when 'tag' + result = get_tag_summary(backend, from_date, to_date, :only => params[:key]) + else + halt 404, JSON.pretty_generate({ 'ok' => false }) + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/token/?" do + content_type :json + + status 404 + result = { 'ok' => false } + + if Vmpooler::API.settings.config[:auth] + status 401 + + need_auth! + + backend.keys('vmpooler__token__*').each do |key| + data = backend.hgetall(key) + + if data['user'] == Rack::Auth::Basic::Request.new(request.env).username + span = OpenTelemetry::Trace.current_span + span.set_attribute('enduser.id', data['user']) + token = key.split('__').last + + result[token] ||= {} + + result[token]['created'] = data['created'] + result[token]['last'] = data['last'] || 'never' + + result['ok'] = true + end + end + + if result['ok'] + status 200 + else + status 404 + end + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/token/:token/?" do + content_type :json + + status 404 + result = { 'ok' => false } + + if Vmpooler::API.settings.config[:auth] + token = backend.hgetall("vmpooler__token__#{params[:token]}") + + if not token.nil? and not token.empty? + status 200 + + pools.each do |pool| + backend.smembers("vmpooler__running__#{pool['name']}").each do |vm| + if backend.hget("vmpooler__vm__#{vm}", 'token:token') == params[:token] + token['vms'] ||= {} + token['vms']['running'] ||= [] + token['vms']['running'].push(vm) + end + end + end + + result = { 'ok' => true, params[:token] => token } + end + end + + JSON.pretty_generate(result) + end + + delete "#{api_prefix}/token/:token/?" do + content_type :json + + status 404 + result = { 'ok' => false } + + if Vmpooler::API.settings.config[:auth] + status 401 + + need_auth! + + if backend.del("vmpooler__token__#{params[:token]}").to_i > 0 + status 200 + result['ok'] = true + end + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/token" do + content_type :json + + status 404 + result = { 'ok' => false } + + if Vmpooler::API.settings.config[:auth] + status 401 + + need_auth! + + o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten + result['token'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join + + backend.hset("vmpooler__token__#{result['token']}", 'user', @auth.username) + backend.hset("vmpooler__token__#{result['token']}", 'created', Time.now) + span = OpenTelemetry::Trace.current_span + span.set_attribute('enduser.id', @auth.username) + + status 200 + result['ok'] = true + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/vm/?" do + content_type :json + + result = [] + + pools.each do |pool| + result.push(pool['name']) + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/ondemandvm/?" do + content_type :json + metrics.increment('http_requests_vm_total.post.ondemand.requestid') + + need_token! if Vmpooler::API.settings.config[:auth] + + result = { 'ok' => false } + + begin + payload = JSON.parse(request.body.read) + + if payload + invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' }) + if invalid.empty? + result = generate_ondemand_request(payload) + else + result[:bad_templates] = invalid + invalid.each do |bad_template| + metrics.increment("ondemandrequest_fail.invalid.#{bad_template}") + end + status 404 + end + else + metrics.increment('ondemandrequest_fail.invalid.unknown') + status 404 + end + rescue JSON::ParserError + span = OpenTelemetry::Trace.current_span + span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed') + status 400 + result = { + 'ok' => false, + 'message' => 'JSON payload could not be parsed' + } + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/ondemandvm/:template/?" do + content_type :json + result = { 'ok' => false } + metrics.increment('http_requests_vm_total.delete.ondemand.template') + + need_token! if Vmpooler::API.settings.config[:auth] + + payload = extract_templates_from_query_params(params[:template]) + + if payload + invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' }) + if invalid.empty? + result = generate_ondemand_request(payload) + else + result[:bad_templates] = invalid + invalid.each do |bad_template| + metrics.increment("ondemandrequest_fail.invalid.#{bad_template}") + end + status 404 + end + else + metrics.increment('ondemandrequest_fail.invalid.unknown') + status 404 + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/ondemandvm/:requestid/?" do + content_type :json + metrics.increment('http_requests_vm_total.get.ondemand.request') + + status 404 + result = check_ondemand_request(params[:requestid]) + + JSON.pretty_generate(result) + end + + delete "#{api_prefix}/ondemandvm/:requestid/?" do + content_type :json + need_token! if Vmpooler::API.settings.config[:auth] + metrics.increment('http_requests_vm_total.delete.ondemand.request') + + status 404 + result = delete_ondemand_request(params[:requestid]) + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/vm/?" do + content_type :json + result = { 'ok' => false } + metrics.increment('http_requests_vm_total.post.vm.checkout') + + payload = JSON.parse(request.body.read) + + if payload + invalid = invalid_templates(payload) + if invalid.empty? + result = atomically_allocate_vms(payload) + else + invalid.each do |bad_template| + metrics.increment("checkout.invalid.#{bad_template}") + end + status 404 + end + else + metrics.increment('checkout.invalid.unknown') + status 404 + end + + JSON.pretty_generate(result) + end + + def extract_templates_from_query_params(params) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + payload = {} + + params.split('+').each do |template| + payload[template] ||= 0 + payload[template] += 1 + end + + payload + end + end + + def invalid_templates(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + invalid = [] + payload.keys.each do |template| + invalid << template unless pool_exists?(template) + end + invalid + end + end + + def invalid_template_or_size(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + invalid = [] + payload.each do |pool, size| + invalid << pool unless pool_exists?(pool) + unless is_integer?(size) + invalid << pool + next + end + invalid << pool unless Integer(size) >= 0 + end + invalid + end + end + + def invalid_template_or_path(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + invalid = [] + payload.each do |pool, template| + invalid << pool unless pool_exists?(pool) + invalid << pool unless template.include? '/' + invalid << pool if template[0] == '/' + invalid << pool if template[-1] == '/' + end + invalid + end + end + + def invalid_pool(payload) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do + invalid = [] + payload.each do |pool, _clone_target| + invalid << pool unless pool_exists?(pool) + end + invalid + end + end + + def check_ondemand_request(request_id) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span| + span.set_attribute('vmpooler.request_id', request_id) + result = { 'ok' => false } + request_hash = backend.hgetall("vmpooler__odrequest__#{request_id}") + if request_hash.empty? + e_message = "no request found for request_id '#{request_id}'" + result['message'] = e_message + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V1.check_ondemand_request', + 'error.message' => e_message + }) + return result + end + + result['request_id'] = request_id + result['ready'] = false + result['ok'] = true + status 202 + + case request_hash['status'] + when 'ready' + result['ready'] = true + Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count| + instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}") + + if result.key?(platform_alias) + result[platform_alias][:hostname] = result[platform_alias][:hostname] + instances + else + result[platform_alias] = { 'hostname': instances } + end + end + result['domain'] = config['domain'] if config['domain'] + status 200 + when 'failed' + result['message'] = "The request failed to provision instances within the configured ondemand_request_ttl '#{config['ondemand_request_ttl']}'" + status 200 + when 'deleted' + result['message'] = 'The request has been deleted' + status 200 + else + Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, count| + instance_count = backend.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}") + instances_pending = count.to_i - instance_count.to_i + + if result.key?(platform_alias) && result[platform_alias].key?(:ready) + result[platform_alias][:ready] = (result[platform_alias][:ready].to_i + instance_count).to_s + result[platform_alias][:pending] = (result[platform_alias][:pending].to_i + instances_pending).to_s + else + result[platform_alias] = { + 'ready': instance_count.to_s, + 'pending': instances_pending.to_s + } + end + end + end + + result + end + end + + def delete_ondemand_request(request_id) + tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span| + span.set_attribute('vmpooler.request_id', request_id) + result = { 'ok' => false } + + platforms = backend.hget("vmpooler__odrequest__#{request_id}", 'requested') + unless platforms + e_message = "no request found for request_id '#{request_id}'" + result['message'] = e_message + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V1.delete_ondemand_request', + 'error.message' => e_message + }) + return result + end + + if backend.hget("vmpooler__odrequest__#{request_id}", 'status') == 'deleted' + result['message'] = 'the request has already been deleted' + else + backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted') + + Parsing.get_platform_pool_count(platforms) do |platform_alias, pool, _count| + backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")&.each do |vm| + backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm) + end + backend.del("vmpooler__#{request_id}__#{platform_alias}__#{pool}") + end + backend.expire("vmpooler__odrequest__#{request_id}", 129_600_0) + end + status 200 + result['ok'] = true + result + end + end + + post "#{api_prefix}/vm/:template/?" do + content_type :json + result = { 'ok' => false } + metrics.increment('http_requests_vm_total.get.vm.template') + + payload = extract_templates_from_query_params(params[:template]) + + if payload + invalid = invalid_templates(payload) + if invalid.empty? + result = atomically_allocate_vms(payload) + else + invalid.each do |bad_template| + metrics.increment("checkout.invalid.#{bad_template}") + end + status 404 + end + else + metrics.increment('checkout.invalid.unknown') + status 404 + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/vm/:hostname/?" do + content_type :json + metrics.increment('http_requests_vm_total.get.vm.hostname') + + result = {} + + status 404 + result['ok'] = false + + params[:hostname] = hostname_shorten(params[:hostname], config['domain']) + + rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}") + unless rdata.empty? + status 200 + result['ok'] = true + + result[params[:hostname]] = {} + + result[params[:hostname]]['template'] = rdata['template'] + result[params[:hostname]]['lifetime'] = (rdata['lifetime'] || config['vm_lifetime']).to_i + + if rdata['destroy'] + result[params[:hostname]]['running'] = ((Time.parse(rdata['destroy']) - Time.parse(rdata['checkout'])) / 60 / 60).round(2) if rdata['checkout'] + result[params[:hostname]]['state'] = 'destroyed' + elsif rdata['checkout'] + result[params[:hostname]]['running'] = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2) + result[params[:hostname]]['remaining'] = ((Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60 - Time.now) / 60 / 60).round(2) + result[params[:hostname]]['start_time'] = Time.parse(rdata['checkout']).to_datetime.rfc3339 + result[params[:hostname]]['end_time'] = (Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60).to_datetime.rfc3339 + result[params[:hostname]]['state'] = 'running' + elsif rdata['check'] + result[params[:hostname]]['state'] = 'ready' + else + result[params[:hostname]]['state'] = 'pending' + end + + rdata.keys.each do |key| + if key.match('^tag\:(.+?)$') + result[params[:hostname]]['tags'] ||= {} + result[params[:hostname]]['tags'][$1] = rdata[key] + end + + if key.match('^snapshot\:(.+?)$') + result[params[:hostname]]['snapshots'] ||= [] + result[params[:hostname]]['snapshots'].push($1) + end + end + + if rdata['disk'] + result[params[:hostname]]['disk'] = rdata['disk'].split(':') + end + + # Look up IP address of the hostname + begin + ipAddress = TCPSocket.gethostbyname(params[:hostname])[3] + rescue StandardError + ipAddress = "" + end + + result[params[:hostname]]['ip'] = ipAddress + + if config['domain'] + result[params[:hostname]]['domain'] = config['domain'] + end + + result[params[:hostname]]['host'] = rdata['host'] if rdata['host'] + result[params[:hostname]]['migrated'] = rdata['migrated'] if rdata['migrated'] + + end + + JSON.pretty_generate(result) + end + + delete "#{api_prefix}/vm/:hostname/?" do + content_type :json + metrics.increment('http_requests_vm_total.delete.vm.hostname') + + result = {} + + status 404 + result['ok'] = false + + params[:hostname] = hostname_shorten(params[:hostname], config['domain']) + + rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}") + unless rdata.empty? + need_token! if rdata['token:token'] + + if backend.srem("vmpooler__running__#{rdata['template']}", params[:hostname]) + backend.sadd("vmpooler__completed__#{rdata['template']}", params[:hostname]) + + status 200 + result['ok'] = true + metrics.increment('delete.success') + update_user_metrics('destroy', params[:hostname]) if Vmpooler::API.settings.config[:config]['usage_stats'] + else + metrics.increment('delete.failed') + end + end + + JSON.pretty_generate(result) + end + + put "#{api_prefix}/vm/:hostname/?" do + content_type :json + metrics.increment('http_requests_vm_total.put.vm.modify') + + status 404 + result = { 'ok' => false } + + failure = [] + + params[:hostname] = hostname_shorten(params[:hostname], config['domain']) + + if backend.exists?("vmpooler__vm__#{params[:hostname]}") + begin + jdata = JSON.parse(request.body.read) + rescue StandardError => e + span = OpenTelemetry::Trace.current_span + span.record_exception(e) + span.status = OpenTelemetry::Trace::Status.error(e.to_s) + halt 400, JSON.pretty_generate(result) + end + + # Validate data payload + jdata.each do |param, arg| + case param + when 'lifetime' + need_token! if Vmpooler::API.settings.config[:auth] + + # in hours, defaults to one week + max_lifetime_upper_limit = config['max_lifetime_upper_limit'] + if max_lifetime_upper_limit + max_lifetime_upper_limit = max_lifetime_upper_limit.to_i + if arg.to_i >= max_lifetime_upper_limit + failure.push("You provided a lifetime (#{arg}) that exceeds the configured maximum of #{max_lifetime_upper_limit}.") + end + end + + # validate lifetime is within boundaries + unless arg.to_i > 0 + failure.push("You provided a lifetime (#{arg}) but you must provide a positive number.") + end + + when 'tags' + failure.push("You provided tags (#{arg}) as something other than a hash.") unless arg.is_a?(Hash) + failure.push("You provided unsuppored tags (#{arg}).") if config['allowed_tags'] && !(arg.keys - config['allowed_tags']).empty? + else + failure.push("Unknown argument #{arg}.") + end + end + + if !failure.empty? + status 400 + result['failure'] = failure + else + jdata.each do |param, arg| + case param + when 'lifetime' + need_token! if Vmpooler::API.settings.config[:auth] + + arg = arg.to_i + + backend.hset("vmpooler__vm__#{params[:hostname]}", param, arg) + when 'tags' + filter_tags(arg) + export_tags(backend, params[:hostname], arg) + end + end + + status 200 + result['ok'] = true + end + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/vm/:hostname/disk/:size/?" do + content_type :json + metrics.increment('http_requests_vm_total.post.vm.disksize') + + need_token! if Vmpooler::API.settings.config[:auth] + + status 404 + result = { 'ok' => false } + + params[:hostname] = hostname_shorten(params[:hostname], config['domain']) + + if ((params[:size].to_i > 0 )and (backend.exists?("vmpooler__vm__#{params[:hostname]}"))) + result[params[:hostname]] = {} + result[params[:hostname]]['disk'] = "+#{params[:size]}gb" + + backend.sadd('vmpooler__tasks__disk', "#{params[:hostname]}:#{params[:size]}") + + status 202 + result['ok'] = true + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/vm/:hostname/snapshot/?" do + content_type :json + metrics.increment('http_requests_vm_total.post.vm.snapshot') + + need_token! if Vmpooler::API.settings.config[:auth] + + status 404 + result = { 'ok' => false } + + params[:hostname] = hostname_shorten(params[:hostname], config['domain']) + + if backend.exists?("vmpooler__vm__#{params[:hostname]}") + result[params[:hostname]] = {} + + o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten + result[params[:hostname]]['snapshot'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join + + backend.sadd('vmpooler__tasks__snapshot', "#{params[:hostname]}:#{result[params[:hostname]]['snapshot']}") + + status 202 + result['ok'] = true + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/vm/:hostname/snapshot/:snapshot/?" do + content_type :json + metrics.increment('http_requests_vm_total.post.vm.snapshot') + + need_token! if Vmpooler::API.settings.config[:auth] + + status 404 + result = { 'ok' => false } + + params[:hostname] = hostname_shorten(params[:hostname], config['domain']) + + unless backend.hget("vmpooler__vm__#{params[:hostname]}", "snapshot:#{params[:snapshot]}").to_i.zero? + backend.sadd('vmpooler__tasks__snapshot-revert', "#{params[:hostname]}:#{params[:snapshot]}") + + status 202 + result['ok'] = true + end + + JSON.pretty_generate(result) + end + + delete "#{api_prefix}/config/poolsize/:pool/?" do + content_type :json + result = { 'ok' => false } + + if config['experimental_features'] + need_token! if Vmpooler::API.settings.config[:auth] + + if pool_exists?(params[:pool]) + result = reset_pool_size(params[:pool]) + else + metrics.increment('config.invalid.unknown') + status 404 + end + else + status 405 + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/config/poolsize/?" do + content_type :json + result = { 'ok' => false } + + if config['experimental_features'] + need_token! if Vmpooler::API.settings.config[:auth] + + payload = JSON.parse(request.body.read) + + if payload + invalid = invalid_template_or_size(payload) + if invalid.empty? + result = update_pool_size(payload) + else + invalid.each do |bad_template| + metrics.increment("config.invalid.#{bad_template}") + end + result[:not_configured] = invalid + status 400 + end + else + metrics.increment('config.invalid.unknown') + status 404 + end + else + status 405 + end + + JSON.pretty_generate(result) + end + + delete "#{api_prefix}/config/pooltemplate/:pool/?" do + content_type :json + result = { 'ok' => false } + + if config['experimental_features'] + need_token! if Vmpooler::API.settings.config[:auth] + + if pool_exists?(params[:pool]) + result = reset_pool_template(params[:pool]) + else + metrics.increment('config.invalid.unknown') + status 404 + end + else + status 405 + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/config/pooltemplate/?" do + content_type :json + result = { 'ok' => false } + + if config['experimental_features'] + need_token! if Vmpooler::API.settings.config[:auth] + + payload = JSON.parse(request.body.read) + + if payload + invalid = invalid_template_or_path(payload) + if invalid.empty? + result = update_pool_template(payload) + else + invalid.each do |bad_template| + metrics.increment("config.invalid.#{bad_template}") + end + result[:bad_templates] = invalid + status 400 + end + else + metrics.increment('config.invalid.unknown') + status 404 + end + else + status 405 + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/poolreset/?" do + content_type :json + result = { 'ok' => false } + + if config['experimental_features'] + need_token! if Vmpooler::API.settings.config[:auth] + + begin + payload = JSON.parse(request.body.read) + if payload + invalid = invalid_templates(payload) + if invalid.empty? + result = reset_pool(payload) + else + invalid.each do |bad_pool| + metrics.increment("poolreset.invalid.#{bad_pool}") + end + result[:bad_pools] = invalid + status 400 + end + else + metrics.increment('poolreset.invalid.unknown') + status 404 + end + rescue JSON::ParserError + span = OpenTelemetry::Trace.current_span + span.record_exception(e) + span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed') + status 400 + result = { + 'ok' => false, + 'message' => 'JSON payload could not be parsed' + } + end + else + status 405 + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/config/clonetarget/?" do + content_type :json + result = { 'ok' => false } + + if config['experimental_features'] + need_token! if Vmpooler::API.settings.config[:auth] + + payload = JSON.parse(request.body.read) + + if payload + invalid = invalid_pool(payload) + if invalid.empty? + result = update_clone_target(payload) + else + invalid.each do |bad_template| + metrics.increment("config.invalid.#{bad_template}") + end + result[:bad_templates] = invalid + status 400 + end + else + metrics.increment('config.invalid.unknown') + status 404 + end + else + status 405 + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/config/?" do + content_type :json + result = { 'ok' => false } + status 404 + + if pools + sync_pool_sizes + sync_pool_templates + + pool_configuration = [] + pools.each do |pool| + pool['template_ready'] = template_ready?(pool, backend) + pool_configuration << pool + end + + result = { + pool_configuration: pool_configuration, + status: { + ok: true + } + } + + status 200 + end + JSON.pretty_generate(result) + end + + get "#{api_prefix}/full_config/?" do + content_type :json + + result = { + full_config: full_config, + status: { + ok: true + } + } + + status 200 + JSON.pretty_generate(result) + end + end + end +end diff --git a/lib/vmpooler/api/v2.rb b/lib/vmpooler/api/v2.rb new file mode 100644 index 0000000..44dad6e --- /dev/null +++ b/lib/vmpooler/api/v2.rb @@ -0,0 +1,505 @@ +# frozen_string_literal: true + +require 'vmpooler/api/v1' + +module Vmpooler + class API + class V2 < Vmpooler::API::V1 + api_version = '2' + api_prefix = "/api/v#{api_version}" + + def full_config + Vmpooler::API.settings.config + end + + def get_template_aliases(template) + tracer.in_span("Vmpooler::API::V2.#{__method__}") do + result = [] + aliases = Vmpooler::API.settings.config[:alias] + if aliases + result += aliases[template] if aliases[template].is_a?(Array) + template_backends << aliases[template] if aliases[template].is_a?(String) + end + result + end + end + + # Fetch a single vm from a pool + # + # @param [String] template + # The template that the vm should be created from + # + # @return [Tuple] vmname, vmpool, vmtemplate + # Returns a tuple containing the vm's name, the pool it came from, and + # what template was used, if successful. Otherwise the tuple contains. + # nil values. + def fetch_single_vm(template) + tracer.in_span("Vmpooler::API::V2.#{__method__}") do + template_backends = [template] + aliases = Vmpooler::API.settings.config[:alias] + if aliases + template_backends += aliases[template] if aliases[template].is_a?(Array) + template_backends << aliases[template] if aliases[template].is_a?(String) + pool_index = pool_index(pools) + weighted_pools = {} + template_backends.each do |t| + next unless pool_index.key? t + + index = pool_index[t] + clone_target = pools[index]['clone_target'] || config['clone_target'] + next unless config.key?('backend_weight') + + weight = config['backend_weight'][clone_target] + if weight + weighted_pools[t] = weight + end + end + + if weighted_pools.count == template_backends.count + pickup = Pickup.new(weighted_pools) + selection = pickup.pick + template_backends.delete(selection) + template_backends.unshift(selection) + else + first = template_backends.sample + template_backends.delete(first) + template_backends.unshift(first) + end + end + + checkoutlock.synchronize do + template_backends.each do |template_backend| + vms = backend.smembers("vmpooler__ready__#{template_backend}") + next if vms.empty? + + vm = vms.pop + smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm) + if smoved + return [vm, template_backend, template] + end + end + [nil, nil, nil] + end + end + end + + # The domain in the result body will be set to the one associated with the + # last vm added. The part of the response is only being retained for + # backwards compatibility as the hostnames are now fqdn's instead of bare + # hostnames. This change is a result of now being able to specify a domain + # per pool. If no vm's in the result had a domain sepcified then the + # domain key will be omitted similar to how it was previously omitted if + # the global option domain wasn't specified. + def atomically_allocate_vms(payload) + tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span| + result = { 'ok' => false } + failed = false + vms = [] # vmpool, vmname, vmtemplate + + validate_token(backend) if Vmpooler::API.settings.config[:auth] and has_token? + + payload.each do |requested, count| + count.to_i.times do |_i| + vmname, vmpool, vmtemplate = fetch_single_vm(requested) + if vmname + account_for_starting_vm(vmpool, vmname) + vms << [vmpool, vmname, vmtemplate] + metrics.increment("checkout.success.#{vmpool}") + update_user_metrics('allocate', vmname) if Vmpooler::API.settings.config[:config]['usage_stats'] + else + failed = true + metrics.increment("checkout.empty.#{requested}") + break + end + end + end + + if failed + vms.each do |(vmpool, vmname, _vmtemplate)| + return_vm_to_ready_state(vmpool, vmname) + end + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V2.atomically_allocate_vms', + 'error.message' => '503 due to failing to allocate one or more vms' + }) + status 503 + else + vm_names = [] + vms.each do |(vmpool, vmname, vmtemplate)| + vmdomain = Parsing.get_domain_for_pool(full_config, vmpool) + if vmdomain + vmfqdn = "#{vmname}.#{vmdomain}" + update_result_hosts(result, vmtemplate, vmfqdn) + vm_names.append(vmfqdn) + else + update_result_hosts(result, vmtemplate, vmname) + vm_names.append(vmname) + end + end + + span.set_attribute('vmpooler.vm_names', vm_names.join(',')) unless vm_names.empty? + + result['ok'] = true + end + + result + end + end + + def generate_ondemand_request(payload) + tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span| + result = { 'ok': false } + + requested_instances = payload.reject { |k, _v| k == 'request_id' } + if too_many_requested?(requested_instances) + e_message = "requested amount of instances exceeds the maximum #{config['max_ondemand_instances_per_request']}" + result['message'] = e_message + status 403 + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V2.generate_ondemand_request', + 'error.message' => "403 due to #{e_message}" + }) + return result + end + + score = Time.now.to_i + request_id = payload['request_id'] + request_id ||= generate_request_id + result['request_id'] = request_id + span.set_attribute('vmpooler.request_id', request_id) + + if backend.exists?("vmpooler__odrequest__#{request_id}") + e_message = "request_id '#{request_id}' has already been created" + result['message'] = e_message + status 409 + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V2.generate_ondemand_request', + 'error.message' => "409 due to #{e_message}" + }) + metrics.increment('ondemandrequest_generate.duplicaterequests') + return result + end + + status 201 + + platforms_with_aliases = [] + requested_instances.each do |poolname, count| + selection = evaluate_template_aliases(poolname, count) + selection.map { |selected_pool, selected_pool_count| platforms_with_aliases << "#{poolname}:#{selected_pool}:#{selected_pool_count}" } + end + platforms_string = platforms_with_aliases.join(',') + + return result unless backend.zadd('vmpooler__provisioning__request', score, request_id) + + backend.hset("vmpooler__odrequest__#{request_id}", 'requested', platforms_string) + if Vmpooler::API.settings.config[:auth] and has_token? + token_token = request.env['HTTP_X_AUTH_TOKEN'] + token_user = backend.hget("vmpooler__token__#{token_token}", 'user') + backend.hset("vmpooler__odrequest__#{request_id}", 'token:token', token_token) + backend.hset("vmpooler__odrequest__#{request_id}", 'token:user', token_user) + span.set_attribute('enduser.id', token_user) + end + + result[:ok] = true + metrics.increment('ondemandrequest_generate.success') + result + end + end + + # Endpoints that use overridden methods + + post "#{api_prefix}/vm/?" do + content_type :json + result = { 'ok' => false } + metrics.increment('http_requests_vm_total.post.vm.checkout') + + payload = JSON.parse(request.body.read) + + if payload + invalid = invalid_templates(payload) + if invalid.empty? + result = atomically_allocate_vms(payload) + else + invalid.each do |bad_template| + metrics.increment("checkout.invalid.#{bad_template}") + end + status 404 + end + else + metrics.increment('checkout.invalid.unknown') + status 404 + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/vm/:template/?" do + content_type :json + result = { 'ok' => false } + metrics.increment('http_requests_vm_total.get.vm.template') + + payload = extract_templates_from_query_params(params[:template]) + + if payload + invalid = invalid_templates(payload) + if invalid.empty? + result = atomically_allocate_vms(payload) + else + invalid.each do |bad_template| + metrics.increment("checkout.invalid.#{bad_template}") + end + status 404 + end + else + metrics.increment('checkout.invalid.unknown') + status 404 + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/vm/:hostname/?" do + content_type :json + metrics.increment('http_requests_vm_total.get.vm.hostname') + + result = {} + + status 404 + result['ok'] = false + + params[:hostname] = hostname_shorten(params[:hostname], nil) + + rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}") + unless rdata.empty? + status 200 + result['ok'] = true + + result[params[:hostname]] = {} + + result[params[:hostname]]['template'] = rdata['template'] + result[params[:hostname]]['lifetime'] = (rdata['lifetime'] || config['vm_lifetime']).to_i + + if rdata['destroy'] + result[params[:hostname]]['running'] = ((Time.parse(rdata['destroy']) - Time.parse(rdata['checkout'])) / 60 / 60).round(2) if rdata['checkout'] + result[params[:hostname]]['state'] = 'destroyed' + elsif rdata['checkout'] + result[params[:hostname]]['running'] = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2) + result[params[:hostname]]['remaining'] = ((Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60 - Time.now) / 60 / 60).round(2) + result[params[:hostname]]['start_time'] = Time.parse(rdata['checkout']).to_datetime.rfc3339 + result[params[:hostname]]['end_time'] = (Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60).to_datetime.rfc3339 + result[params[:hostname]]['state'] = 'running' + elsif rdata['check'] + result[params[:hostname]]['state'] = 'ready' + else + result[params[:hostname]]['state'] = 'pending' + end + + rdata.keys.each do |key| + if key.match('^tag\:(.+?)$') + result[params[:hostname]]['tags'] ||= {} + result[params[:hostname]]['tags'][$1] = rdata[key] + end + + if key.match('^snapshot\:(.+?)$') + result[params[:hostname]]['snapshots'] ||= [] + result[params[:hostname]]['snapshots'].push($1) + end + end + + if rdata['disk'] + result[params[:hostname]]['disk'] = rdata['disk'].split(':') + end + + # Look up IP address of the hostname + begin + ipAddress = TCPSocket.gethostbyname(params[:hostname])[3] + rescue StandardError + ipAddress = "" + end + + result[params[:hostname]]['ip'] = ipAddress + + if rdata['pool'] + vmdomain = Parsing.get_domain_for_pool(full_config, rdata['pool']) + if vmdomain + result[params[:hostname]]['fqdn'] = "#{params[:hostname]}.#{vmdomain}" + end + end + + result[params[:hostname]]['host'] = rdata['host'] if rdata['host'] + result[params[:hostname]]['migrated'] = rdata['migrated'] if rdata['migrated'] + + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/ondemandvm/?" do + content_type :json + metrics.increment('http_requests_vm_total.post.ondemand.requestid') + + need_token! if Vmpooler::API.settings.config[:auth] + + result = { 'ok' => false } + + begin + payload = JSON.parse(request.body.read) + + if payload + invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' }) + if invalid.empty? + result = generate_ondemand_request(payload) + else + result[:bad_templates] = invalid + invalid.each do |bad_template| + metrics.increment("ondemandrequest_fail.invalid.#{bad_template}") + end + status 404 + end + else + metrics.increment('ondemandrequest_fail.invalid.unknown') + status 404 + end + rescue JSON::ParserError + span = OpenTelemetry::Trace.current_span + span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed') + status 400 + result = { + 'ok' => false, + 'message' => 'JSON payload could not be parsed' + } + end + + JSON.pretty_generate(result) + end + + post "#{api_prefix}/ondemandvm/:template/?" do + content_type :json + result = { 'ok' => false } + metrics.increment('http_requests_vm_total.delete.ondemand.template') + + need_token! if Vmpooler::API.settings.config[:auth] + + payload = extract_templates_from_query_params(params[:template]) + + if payload + invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' }) + if invalid.empty? + result = generate_ondemand_request(payload) + else + result[:bad_templates] = invalid + invalid.each do |bad_template| + metrics.increment("ondemandrequest_fail.invalid.#{bad_template}") + end + status 404 + end + else + metrics.increment('ondemandrequest_fail.invalid.unknown') + status 404 + end + + JSON.pretty_generate(result) + end + + get "#{api_prefix}/ondemandvm/:requestid/?" do + content_type :json + metrics.increment('http_requests_vm_total.get.ondemand.request') + + status 404 + result = check_ondemand_request(params[:requestid]) + + JSON.pretty_generate(result) + end + + def check_ondemand_request(request_id) + tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span| + span.set_attribute('vmpooler.request_id', request_id) + result = { 'ok' => false } + request_hash = backend.hgetall("vmpooler__odrequest__#{request_id}") + if request_hash.empty? + e_message = "no request found for request_id '#{request_id}'" + result['message'] = e_message + span.add_event('error', attributes: { + 'error.type' => 'Vmpooler::API::V2.check_ondemand_request', + 'error.message' => e_message + }) + return result + end + + result['request_id'] = request_id + result['ready'] = false + result['ok'] = true + status 202 + + case request_hash['status'] + when 'ready' + result['ready'] = true + Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count| + instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}") + domain = Parsing.get_domain_for_pool(full_config, pool) + instances.map! { |instance| instance.concat(".#{domain}") } if domain + + if result.key?(platform_alias) + result[platform_alias][:hostname] = result[platform_alias][:hostname] + instances + else + result[platform_alias] = { 'hostname': instances } + end + end + status 200 + when 'failed' + result['message'] = "The request failed to provision instances within the configured ondemand_request_ttl '#{config['ondemand_request_ttl']}'" + status 200 + when 'deleted' + result['message'] = 'The request has been deleted' + status 200 + else + Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, count| + instance_count = backend.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}") + instances_pending = count.to_i - instance_count.to_i + + if result.key?(platform_alias) && result[platform_alias].key?(:ready) + result[platform_alias][:ready] = (result[platform_alias][:ready].to_i + instance_count).to_s + result[platform_alias][:pending] = (result[platform_alias][:pending].to_i + instances_pending).to_s + else + result[platform_alias] = { + 'ready': instance_count.to_s, + 'pending': instances_pending.to_s + } + end + end + end + + result + end + end + + # Endpoints that only use bits from the V1 api are called here + # Note that traces will be named based on the route used in the V1 api + # but the http.url trace attribute will still have the actual requested url in it + + delete "#{api_prefix}/*" do + versionless_path_info = request.path_info.delete_prefix("#{api_prefix}/") + request.path_info = "/api/v1/#{versionless_path_info}" + call env + end + + get "#{api_prefix}/*" do + versionless_path_info = request.path_info.delete_prefix("#{api_prefix}/") + request.path_info = "/api/v1/#{versionless_path_info}" + call env + end + + post "#{api_prefix}/*" do + versionless_path_info = request.path_info.delete_prefix("#{api_prefix}/") + request.path_info = "/api/v1/#{versionless_path_info}" + call env + end + + put "#{api_prefix}/*" do + versionless_path_info = request.path_info.delete_prefix("#{api_prefix}/") + request.path_info = "/api/v1/#{versionless_path_info}" + call env + end + end + end +end diff --git a/lib/vmpooler/api/v3.rb b/lib/vmpooler/api/v3.rb deleted file mode 100644 index 21bc4e3..0000000 --- a/lib/vmpooler/api/v3.rb +++ /dev/null @@ -1,1876 +0,0 @@ -# frozen_string_literal: true - -require 'vmpooler/util/parsing' -require 'vmpooler/dns' - -module Vmpooler - class API - class V3 < Sinatra::Base - api_version = '3' - api_prefix = "/api/v#{api_version}" - - # Simple in-memory cache for status endpoint - # rubocop:disable Style/ClassVars - @@status_cache = {} - @@status_cache_mutex = Mutex.new - # rubocop:enable Style/ClassVars - STATUS_CACHE_TTL = 30 # seconds - - # Clear cache (useful for testing) - def self.clear_status_cache - @@status_cache_mutex.synchronize do - @@status_cache.clear - end - end - - helpers do - include Vmpooler::API::Helpers - end - - def backend - Vmpooler::API.settings.redis - end - - def metrics - Vmpooler::API.settings.metrics - end - - def config - Vmpooler::API.settings.config[:config] - end - - def full_config - Vmpooler::API.settings.config - end - - def pools - Vmpooler::API.settings.config[:pools] - end - - def pools_at_startup - Vmpooler::API.settings.config[:pools_at_startup] - end - - def pool_exists?(template) - Vmpooler::API.settings.config[:pool_names].include?(template) - end - - def need_auth! - validate_auth(backend) - end - - def need_token! - validate_token(backend) - end - - def checkoutlock - Vmpooler::API.settings.checkoutlock - end - - def get_template_aliases(template) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - result = [] - aliases = Vmpooler::API.settings.config[:alias] - if aliases - result += aliases[template] if aliases[template].is_a?(Array) - template_backends << aliases[template] if aliases[template].is_a?(String) - end - result - end - end - - def get_pool_weights(template_backends) - pool_index = pool_index(pools) - weighted_pools = {} - template_backends.each do |t| - next unless pool_index.key? t - - index = pool_index[t] - clone_target = pools[index]['clone_target'] || config['clone_target'] - next unless config.key?('backend_weight') - - weight = config['backend_weight'][clone_target] - if weight - weighted_pools[t] = weight - end - end - weighted_pools - end - - def count_selection(selection) - result = {} - selection.uniq.each do |poolname| - result[poolname] = selection.count(poolname) - end - result - end - - def evaluate_template_aliases(template, count) - template_backends = [] - template_backends << template if backend.sismember('vmpooler__pools', template) - selection = [] - aliases = get_template_aliases(template) - if aliases - template_backends += aliases - weighted_pools = get_pool_weights(template_backends) - - if weighted_pools.count > 1 && weighted_pools.count == template_backends.count - pickup = Pickup.new(weighted_pools) - count.to_i.times do - selection << pickup.pick - end - else - count.to_i.times do - selection << template_backends.sample - end - end - end - - count_selection(selection) - end - - # Fetch a single vm from a pool - # - # @param [String] template - # The template that the vm should be created from - # - # @return [Tuple] vmname, vmpool, vmtemplate - # Returns a tuple containing the vm's name, the pool it came from, and - # what template was used, if successful. Otherwise the tuple contains. - # nil values. - def fetch_single_vm(template) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - template_backends = [template] - aliases = Vmpooler::API.settings.config[:alias] - if aliases - template_backends += aliases[template] if aliases[template].is_a?(Array) - template_backends << aliases[template] if aliases[template].is_a?(String) - pool_index = pool_index(pools) - weighted_pools = {} - template_backends.each do |t| - next unless pool_index.key? t - - index = pool_index[t] - clone_target = pools[index]['clone_target'] || config['clone_target'] - next unless config.key?('backend_weight') - - weight = config['backend_weight'][clone_target] - if weight - weighted_pools[t] = weight - end - end - - if weighted_pools.count == template_backends.count - pickup = Pickup.new(weighted_pools) - selection = pickup.pick - template_backends.delete(selection) - template_backends.unshift(selection) - else - first = template_backends.sample - template_backends.delete(first) - template_backends.unshift(first) - end - end - - checkoutlock.synchronize do - template_backends.each do |template_backend| - vms = backend.smembers("vmpooler__ready__#{template_backend}") - next if vms.empty? - - vm = vms.pop - smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm) - if smoved - return [vm, template_backend, template] - end - end - [nil, nil, nil] - end - end - end - - def return_vm_to_ready_state(template, vm) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - backend.srem("vmpooler__migrating__#{template}", vm) - backend.hdel("vmpooler__active__#{template}", vm) - backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user') - backend.smove("vmpooler__running__#{template}", "vmpooler__ready__#{template}", vm) - end - end - - def account_for_starting_vm(template, vm) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span| - user = backend.hget("vmpooler__token__#{request.env['HTTP_X_AUTH_TOKEN']}", 'user') - span.set_attribute('enduser.id', user) - has_token_result = has_token? - backend.sadd("vmpooler__migrating__#{template}", vm) - backend.hset("vmpooler__active__#{template}", vm, Time.now.to_s) - backend.hset("vmpooler__vm__#{vm}", 'checkout', Time.now.to_s) - - if Vmpooler::API.settings.config[:auth] and has_token_result - backend.hset("vmpooler__vm__#{vm}", 'token:token', request.env['HTTP_X_AUTH_TOKEN']) - backend.hset("vmpooler__vm__#{vm}", 'token:user', user) - - if config['vm_lifetime_auth'].to_i > 0 - backend.hset("vmpooler__vm__#{vm}", 'lifetime', config['vm_lifetime_auth'].to_i) - end - end - end - end - - def update_result_hosts(result, template, vm) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - result[template] ||= {} - if result[template]['hostname'] - result[template]['hostname'] = Array(result[template]['hostname']) - result[template]['hostname'].push(vm) - else - result[template]['hostname'] = vm - end - end - end - - def atomically_allocate_vms(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span| - result = { 'ok' => false } - failed = false - vms = [] # vmpool, vmname, vmtemplate - - validate_token(backend) if Vmpooler::API.settings.config[:auth] and has_token? - - payload.each do |requested, count| - count.to_i.times do |_i| - vmname, vmpool, vmtemplate = fetch_single_vm(requested) - if vmname - account_for_starting_vm(vmpool, vmname) - vms << [vmpool, vmname, vmtemplate] - metrics.increment("checkout.success.#{vmpool}") - update_user_metrics('allocate', vmname) if Vmpooler::API.settings.config[:config]['usage_stats'] - else - failed = true - metrics.increment("checkout.empty.#{requested}") - break - end - end - end - - if failed - vms.each do |(vmpool, vmname, _vmtemplate)| - return_vm_to_ready_state(vmpool, vmname) - end - span.add_event('error', attributes: { - 'error.type' => 'Vmpooler::API::V3.atomically_allocate_vms', - 'error.message' => '503 due to failing to allocate one or more vms' - }) - status 503 - else - vm_names = [] - vms.each do |(vmpool, vmname, vmtemplate)| - vmdomain = Dns.get_domain_for_pool(full_config, vmpool) - vmfqdn = "#{vmname}.#{vmdomain}" - update_result_hosts(result, vmtemplate, vmfqdn) - vm_names.append(vmfqdn) - end - - span.set_attribute('vmpooler.vm_names', vm_names.join(',')) unless vm_names.empty? - - result['ok'] = true - end - - result - end - end - - def component_to_test(match, labels_string) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - return if labels_string.nil? - - labels_string_parts = labels_string.split(',') - labels_string_parts.each do |part| - key, value = part.split('=') - next if value.nil? - return value if key == match - end - 'none' - end - end - - def update_user_metrics(operation, vmname) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span| - begin - jenkins_build_url = backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url') - user = backend.hget("vmpooler__vm__#{vmname}", 'token:user') - poolname = backend.hget("vmpooler__vm__#{vmname}", 'template') - poolname = poolname.gsub('.', '_') - - if user - user = user.gsub('.', '_') - else - user = 'unauthenticated' - end - metrics.increment("user.#{user}.#{operation}.#{poolname}") - - if jenkins_build_url - if jenkins_build_url.include? 'litmus' - # Very simple filter for Litmus jobs - just count them coming through for the moment. - metrics.increment("usage_litmus.#{user}.#{operation}.#{poolname}") - else - url_parts = jenkins_build_url.split('/')[2..] - jenkins_instance = url_parts[0].gsub('.', '_') - value_stream_parts = url_parts[2].split('_') - value_stream_parts = value_stream_parts.map { |s| s.gsub('.', '_') } - value_stream = value_stream_parts.shift - branch = value_stream_parts.pop - project = value_stream_parts.shift - job_name = value_stream_parts.join('_') - build_metadata_parts = url_parts[3] - component_to_test = component_to_test('RMM_COMPONENT_TO_TEST_NAME', build_metadata_parts) - - metrics.increment("usage_jenkins_instance.#{jenkins_instance}.#{value_stream}.#{operation}.#{poolname}") - metrics.increment("usage_branch_project.#{branch}.#{project}.#{operation}.#{poolname}") - metrics.increment("usage_job_component.#{job_name}.#{component_to_test}.#{operation}.#{poolname}") - end - end - rescue StandardError => e - puts 'd', "[!] [#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}" - span.record_exception(e) - span.status = OpenTelemetry::Trace::Status.error(e.to_s) - span.add_event('log', attributes: { - 'log.severity' => 'debug', - 'log.message' => "[#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}" - }) - end - end - end - - def reset_pool_size(poolname) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - result = { 'ok' => false } - - pool_index = pool_index(pools) - - pools_updated = 0 - sync_pool_sizes - - pool_size_now = pools[pool_index[poolname]]['size'].to_i - pool_size_original = pools_at_startup[pool_index[poolname]]['size'].to_i - result['pool_size_before_reset'] = pool_size_now - result['pool_size_before_overrides'] = pool_size_original - - unless pool_size_now == pool_size_original - pools[pool_index[poolname]]['size'] = pool_size_original - backend.hdel('vmpooler__config__poolsize', poolname) - backend.sadd('vmpooler__pool__undo_size_override', poolname) - pools_updated += 1 - status 201 - end - - status 200 unless pools_updated > 0 - result['ok'] = true - result - end - end - - def update_pool_size(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - result = { 'ok' => false } - - pool_index = pool_index(pools) - pools_updated = 0 - sync_pool_sizes - - payload.each do |poolname, size| - unless pools[pool_index[poolname]]['size'] == size.to_i - pools[pool_index[poolname]]['size'] = size.to_i - backend.hset('vmpooler__config__poolsize', poolname, size) - pools_updated += 1 - status 201 - end - end - status 200 unless pools_updated > 0 - result['ok'] = true - result - end - end - - def reset_pool_template(poolname) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - result = { 'ok' => false } - - pool_index_live = pool_index(pools) - pool_index_original = pool_index(pools_at_startup) - - pools_updated = 0 - sync_pool_templates - - template_now = pools[pool_index_live[poolname]]['template'] - template_original = pools_at_startup[pool_index_original[poolname]]['template'] - result['template_before_reset'] = template_now - result['template_before_overrides'] = template_original - - unless template_now == template_original - pools[pool_index_live[poolname]]['template'] = template_original - backend.hdel('vmpooler__config__template', poolname) - backend.sadd('vmpooler__pool__undo_template_override', poolname) - pools_updated += 1 - status 201 - end - - status 200 unless pools_updated > 0 - result['ok'] = true - result - end - end - - def update_pool_template(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - result = { 'ok' => false } - - pool_index = pool_index(pools) - pools_updated = 0 - sync_pool_templates - - payload.each do |poolname, template| - unless pools[pool_index[poolname]]['template'] == template - pools[pool_index[poolname]]['template'] = template - backend.hset('vmpooler__config__template', poolname, template) - pools_updated += 1 - status 201 - end - end - status 200 unless pools_updated > 0 - result['ok'] = true - result - end - end - - def reset_pool(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - result = { 'ok' => false } - - payload.each do |poolname, _count| - backend.sadd('vmpooler__poolreset', poolname) - end - status 201 - result['ok'] = true - result - end - end - - def update_clone_target(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - result = { 'ok' => false } - - pool_index = pool_index(pools) - pools_updated = 0 - sync_clone_targets - - payload.each do |poolname, clone_target| - unless pools[pool_index[poolname]]['clone_target'] == clone_target - pools[pool_index[poolname]]['clone_target'] = clone_target - backend.hset('vmpooler__config__clone_target', poolname, clone_target) - pools_updated += 1 - status 201 - end - end - status 200 unless pools_updated > 0 - result['ok'] = true - result - end - end - - # Cache helper methods for status endpoint - def get_cached_status(cache_key) - @@status_cache_mutex.synchronize do - cached = @@status_cache[cache_key] - if cached && (Time.now - cached[:timestamp]) < STATUS_CACHE_TTL - return cached[:data] - end - - nil - end - end - - def set_cached_status(cache_key, data) - @@status_cache_mutex.synchronize do - @@status_cache[cache_key] = { - data: data, - timestamp: Time.now - } - # Cleanup old cache entries (keep only last 10 unique view combinations) - if @@status_cache.size > 10 - oldest = @@status_cache.min_by { |_k, v| v[:timestamp] } - @@status_cache.delete(oldest[0]) - end - end - end - - def sync_pool_templates - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - pool_index = pool_index(pools) - template_configs = backend.hgetall('vmpooler__config__template') - template_configs&.each do |poolname, template| - next unless pool_index.include? poolname - - pools[pool_index[poolname]]['template'] = template - end - end - end - - def sync_pool_sizes - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - pool_index = pool_index(pools) - poolsize_configs = backend.hgetall('vmpooler__config__poolsize') - poolsize_configs&.each do |poolname, size| - next unless pool_index.include? poolname - - pools[pool_index[poolname]]['size'] = size.to_i - end - end - end - - def sync_clone_targets - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - pool_index = pool_index(pools) - clone_target_configs = backend.hgetall('vmpooler__config__clone_target') - clone_target_configs&.each do |poolname, clone_target| - next unless pool_index.include? poolname - - pools[pool_index[poolname]]['clone_target'] = clone_target - end - end - end - - def too_many_requested?(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - payload&.each do |poolname, count| - next unless count.to_i > config['max_ondemand_instances_per_request'] - - metrics.increment("ondemandrequest_fail.toomanyrequests.#{poolname}") - return true - end - false - end - end - - def generate_ondemand_request(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span| - result = { 'ok': false } - - requested_instances = payload.reject { |k, _v| k == 'request_id' } - if too_many_requested?(requested_instances) - e_message = "requested amount of instances exceeds the maximum #{config['max_ondemand_instances_per_request']}" - result['message'] = e_message - status 403 - span.add_event('error', attributes: { - 'error.type' => 'Vmpooler::API::V3.generate_ondemand_request', - 'error.message' => "403 due to #{e_message}" - }) - return result - end - - score = Time.now.to_i - request_id = payload['request_id'] - request_id ||= generate_request_id - result['request_id'] = request_id - span.set_attribute('vmpooler.request_id', request_id) - - if backend.exists?("vmpooler__odrequest__#{request_id}") - e_message = "request_id '#{request_id}' has already been created" - result['message'] = e_message - status 409 - span.add_event('error', attributes: { - 'error.type' => 'Vmpooler::API::V3.generate_ondemand_request', - 'error.message' => "409 due to #{e_message}" - }) - metrics.increment('ondemandrequest_generate.duplicaterequests') - return result - end - - status 201 - - platforms_with_aliases = [] - requested_instances.each do |poolname, count| - selection = evaluate_template_aliases(poolname, count) - selection.map { |selected_pool, selected_pool_count| platforms_with_aliases << "#{poolname}:#{selected_pool}:#{selected_pool_count}" } - end - platforms_string = platforms_with_aliases.join(',') - - return result unless backend.zadd('vmpooler__provisioning__request', score, request_id) - - backend.hset("vmpooler__odrequest__#{request_id}", 'requested', platforms_string) - if Vmpooler::API.settings.config[:auth] and has_token? - token_token = request.env['HTTP_X_AUTH_TOKEN'] - token_user = backend.hget("vmpooler__token__#{token_token}", 'user') - backend.hset("vmpooler__odrequest__#{request_id}", 'token:token', token_token) - backend.hset("vmpooler__odrequest__#{request_id}", 'token:user', token_user) - span.set_attribute('enduser.id', token_user) - end - - result[:ok] = true - metrics.increment('ondemandrequest_generate.success') - result - end - end - - def generate_request_id - SecureRandom.uuid - end - - get '/' do - sync_pool_sizes - redirect to('/dashboard/') - end - - # Provide run-time statistics - # - # Example: - # - # { - # "boot": { - # "duration": { - # "average": 163.6, - # "min": 65.49, - # "max": 830.07, - # "total": 247744.71000000002 - # }, - # "count": { - # "total": 1514 - # } - # }, - # "capacity": { - # "current": 968, - # "total": 975, - # "percent": 99.3 - # }, - # "clone": { - # "duration": { - # "average": 17.0, - # "min": 4.66, - # "max": 637.96, - # "total": 25634.15 - # }, - # "count": { - # "total": 1507 - # } - # }, - # "queue": { - # "pending": 12, - # "cloning": 0, - # "booting": 12, - # "ready": 968, - # "running": 367, - # "completed": 0, - # "total": 1347 - # }, - # "pools": { - # "ready": 100, - # "running": 120, - # "pending": 5, - # "max": 250, - # } - # "status": { - # "ok": true, - # "message": "Battle station fully armed and operational.", - # "empty": [ # NOTE: would not have 'ok: true' w/ "empty" pools - # "redhat-7-x86_64", - # "ubuntu-1404-i386" - # ], - # "uptime": 179585.9 - # } - # - # If the query parameter 'view' is provided, it will be used to select which top level - # element to compute and return. Select them by specifying them in a comma separated list. - # For example /status?view=capacity,boot - # would return only the "capacity" and "boot" statistics. "status" is always returned - - get "#{api_prefix}/status/?" do - content_type :json - - # Create cache key based on view parameters - cache_key = params[:view] ? "status_#{params[:view]}" : "status_all" - - # Try to get cached response - cached_response = get_cached_status(cache_key) - return cached_response if cached_response - - if params[:view] - views = params[:view].split(",") - end - - result = { - status: { - ok: true, - message: 'Battle station fully armed and operational.' - } - } - - sync_pool_sizes - - result[:capacity] = get_capacity_metrics(pools, backend) unless views and not views.include?("capacity") - result[:queue] = get_queue_metrics(pools, backend) unless views and not views.include?("queue") - result[:clone] = get_task_metrics(backend, 'clone', Date.today.to_s) unless views and not views.include?("clone") - result[:boot] = get_task_metrics(backend, 'boot', Date.today.to_s) unless views and not views.include?("boot") - - # Check for empty pools - result[:pools] = {} unless views and not views.include?("pools") - ready_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__ready__', backend) - running_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__running__', backend) - pending_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__pending__', backend) - lastBoot_hash = get_list_across_pools_redis_hget(pools, 'vmpooler__lastboot', backend) - - unless views and not views.include?("pools") - pools.each do |pool| - # REMIND: move this out of the API and into the back-end - ready = ready_hash[pool['name']] - running = running_hash[pool['name']] - pending = pending_hash[pool['name']] - max = pool['size'] - lastBoot = lastBoot_hash[pool['name']] - aka = pool['alias'] - - result[:pools][pool['name']] = { - ready: ready, - running: running, - pending: pending, - max: max, - lastBoot: lastBoot - } - - if aka - result[:pools][pool['name']][:alias] = aka - end - - # for backwards compatibility, include separate "empty" stats in "status" block - if ready == 0 && max != 0 - result[:status][:empty] ||= [] - result[:status][:empty].push(pool['name']) - - result[:status][:ok] = false - result[:status][:message] = "Found #{result[:status][:empty].length} empty pools." - end - end - end - - result[:status][:uptime] = (Time.now - Vmpooler::API.settings.config[:uptime]).round(1) if Vmpooler::API.settings.config[:uptime] - - response = JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }]) - - # Cache the response - set_cached_status(cache_key, response) - - response - end - - # request statistics for specific pools by passing parameter 'pool' - # with a coma separated list of pools we want to query ?pool=ABC,DEF - # returns the ready, max numbers and the aliases (if set) - get "#{api_prefix}/poolstat/?" do - content_type :json - - result = {} - - poolscopy = [] - - if params[:pool] - subpool = params[:pool].split(",") - poolscopy = pools.select do |p| - if subpool.include?(p['name']) - true - elsif !p['alias'].nil? - if p['alias'].instance_of?(Array) - (p['alias'] & subpool).any? - elsif p['alias'].instance_of?(String) - subpool.include?(p['alias']) - end - end - end - end - - result[:pools] = {} - - poolscopy.each do |pool| - result[:pools][pool['name']] = {} - - max = pool['size'] - aka = pool['alias'] - - result[:pools][pool['name']][:max] = max - - if aka - result[:pools][pool['name']][:alias] = aka - end - end - - ready_hash = get_list_across_pools_redis_scard(poolscopy, 'vmpooler__ready__', backend) - - ready_hash.each { |k, v| result[:pools][k][:ready] = v } - - JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }]) - end - - # requests the total number of running VMs - get "#{api_prefix}/totalrunning/?" do - content_type :json - queue = { - running: 0 - } - - queue[:running] = get_total_across_pools_redis_scard(pools, 'vmpooler__running__', backend) - - JSON.pretty_generate(queue) - end - - get "#{api_prefix}/summary/?" do - content_type :json - - result = { - daily: [] - } - - from_param = params[:from] || Date.today.to_s - to_param = params[:to] || Date.today.to_s - - # Validate date formats - [from_param, to_param].each do |param| - if !validate_date_str(param.to_s) - halt 400, "Invalid date format '#{param}', must match YYYY-MM-DD." - end - end - - from_date, to_date = Date.parse(from_param), Date.parse(to_param) - - if to_date < from_date - halt 400, 'Date range is invalid, \'to\' cannot come before \'from\'.' - elsif from_date > Date.today - halt 400, 'Date range is invalid, \'from\' must be in the past.' - end - - boot = get_task_summary(backend, 'boot', from_date, to_date, :bypool => true) - clone = get_task_summary(backend, 'clone', from_date, to_date, :bypool => true) - tag = get_tag_summary(backend, from_date, to_date) - - result[:boot] = boot[:boot] - result[:clone] = clone[:clone] - result[:tag] = tag[:tag] - - daily = {} - - boot[:daily].each do |day| - daily[day[:date]] ||= {} - daily[day[:date]][:boot] = day[:boot] - end - - clone[:daily].each do |day| - daily[day[:date]] ||= {} - daily[day[:date]][:clone] = day[:clone] - end - - tag[:daily].each do |day| - daily[day[:date]] ||= {} - daily[day[:date]][:tag] = day[:tag] - end - - daily.each_key do |day| - result[:daily].push({ - date: day, - boot: daily[day][:boot], - clone: daily[day][:clone], - tag: daily[day][:tag] - }) - end - - JSON.pretty_generate(result) - end - - get "#{api_prefix}/summary/:route/?:key?/?" do - content_type :json - - result = {} - - from_param = params[:from] || Date.today.to_s - to_param = params[:to] || Date.today.to_s - - # Validate date formats - [from_param, to_param].each do |param| - if !validate_date_str(param.to_s) - halt 400, "Invalid date format '#{param}', must match YYYY-MM-DD." - end - end - - from_date, to_date = Date.parse(from_param), Date.parse(to_param) - - if to_date < from_date - halt 400, 'Date range is invalid, \'to\' cannot come before \'from\'.' - elsif from_date > Date.today - halt 400, 'Date range is invalid, \'from\' must be in the past.' - end - - case params[:route] - when 'boot' - result = get_task_summary(backend, 'boot', from_date, to_date, :bypool => true, :only => params[:key]) - when 'clone' - result = get_task_summary(backend, 'clone', from_date, to_date, :bypool => true, :only => params[:key]) - when 'tag' - result = get_tag_summary(backend, from_date, to_date, :only => params[:key]) - else - halt 404, JSON.pretty_generate({ 'ok' => false }) - end - - JSON.pretty_generate(result) - end - - get "#{api_prefix}/token/?" do - content_type :json - - status 404 - result = { 'ok' => false } - - if Vmpooler::API.settings.config[:auth] - status 401 - - need_auth! - - backend.keys('vmpooler__token__*').each do |key| - data = backend.hgetall(key) - - if data['user'] == Rack::Auth::Basic::Request.new(request.env).username - span = OpenTelemetry::Trace.current_span - span.set_attribute('enduser.id', data['user']) - token = key.split('__').last - - result[token] ||= {} - - result[token]['created'] = data['created'] - result[token]['last'] = data['last'] || 'never' - - result['ok'] = true - end - end - - if result['ok'] - status 200 - else - status 404 - end - end - - JSON.pretty_generate(result) - end - - get "#{api_prefix}/token/:token/?" do - content_type :json - - status 404 - result = { 'ok' => false } - - if Vmpooler::API.settings.config[:auth] - token = backend.hgetall("vmpooler__token__#{params[:token]}") - - if not token.nil? and not token.empty? - status 200 - - pools.each do |pool| - backend.smembers("vmpooler__running__#{pool['name']}").each do |vm| - if backend.hget("vmpooler__vm__#{vm}", 'token:token') == params[:token] - token['vms'] ||= {} - token['vms']['running'] ||= [] - token['vms']['running'].push(vm) - end - end - end - - result = { 'ok' => true, params[:token] => token } - end - end - - JSON.pretty_generate(result) - end - - delete "#{api_prefix}/token/:token/?" do - content_type :json - - status 404 - result = { 'ok' => false } - - if Vmpooler::API.settings.config[:auth] - status 401 - - need_auth! - - if backend.del("vmpooler__token__#{params[:token]}").to_i > 0 - status 200 - result['ok'] = true - end - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/token" do - content_type :json - - status 404 - result = { 'ok' => false } - - if Vmpooler::API.settings.config[:auth] - status 401 - - need_auth! - - o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten - result['token'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join - - backend.hset("vmpooler__token__#{result['token']}", 'user', @auth.username) - backend.hset("vmpooler__token__#{result['token']}", 'created', Time.now.to_s) - span = OpenTelemetry::Trace.current_span - span.set_attribute('enduser.id', @auth.username) - - status 200 - result['ok'] = true - end - - JSON.pretty_generate(result) - end - - get "#{api_prefix}/vm/?" do - content_type :json - - result = [] - - pools.each do |pool| - result.push(pool['name']) - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/ondemandvm/?" do - content_type :json - metrics.increment('http_requests_vm_total.post.ondemand.requestid') - - need_token! if Vmpooler::API.settings.config[:auth] - - result = { 'ok' => false } - - begin - payload = JSON.parse(request.body.read) - - if payload - invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' }) - if invalid.empty? - result = generate_ondemand_request(payload) - else - result[:bad_templates] = invalid - invalid.each do |bad_template| - metrics.increment("ondemandrequest_fail.invalid.#{bad_template}") - end - status 404 - end - else - metrics.increment('ondemandrequest_fail.invalid.unknown') - status 404 - end - rescue JSON::ParserError - span = OpenTelemetry::Trace.current_span - span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed') - status 400 - result = { - 'ok' => false, - 'message' => 'JSON payload could not be parsed' - } - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/ondemandvm/:template/?" do - content_type :json - result = { 'ok' => false } - metrics.increment('http_requests_vm_total.delete.ondemand.template') - - need_token! if Vmpooler::API.settings.config[:auth] - - payload = extract_templates_from_query_params(params[:template]) - - if payload - invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' }) - if invalid.empty? - result = generate_ondemand_request(payload) - else - result[:bad_templates] = invalid - invalid.each do |bad_template| - metrics.increment("ondemandrequest_fail.invalid.#{bad_template}") - end - status 404 - end - else - metrics.increment('ondemandrequest_fail.invalid.unknown') - status 404 - end - - JSON.pretty_generate(result) - end - - get "#{api_prefix}/ondemandvm/:requestid/?" do - content_type :json - metrics.increment('http_requests_vm_total.get.ondemand.request') - - status 404 - result = check_ondemand_request(params[:requestid]) - - JSON.pretty_generate(result) - end - - delete "#{api_prefix}/ondemandvm/:requestid/?" do - content_type :json - need_token! if Vmpooler::API.settings.config[:auth] - metrics.increment('http_requests_vm_total.delete.ondemand.request') - - status 404 - result = delete_ondemand_request(params[:requestid]) - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/vm/?" do - content_type :json - result = { 'ok' => false } - metrics.increment('http_requests_vm_total.post.vm.checkout') - - # Validate and sanitize JSON body - payload = sanitize_json_body(request.body.read) - if validation_error?(payload) - status 400 - return JSON.pretty_generate(payload) - end - - # Validate each template and count - payload.each do |template, count| - validation = validate_pool_name(template) - if validation_error?(validation) - status 400 - return JSON.pretty_generate(validation) - end - - validated_count = validate_vm_count(count) - if validation_error?(validated_count) - status 400 - return JSON.pretty_generate(validated_count) - end - end - - if payload && !payload.empty? - invalid = invalid_templates(payload) - if invalid.empty? - result = atomically_allocate_vms(payload) - else - invalid.each do |bad_template| - metrics.increment("checkout.invalid.#{bad_template}") - end - status 404 - end - else - metrics.increment('checkout.invalid.unknown') - status 404 - end - - JSON.pretty_generate(result) - end - - def extract_templates_from_query_params(params) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - payload = {} - - params.split('+').each do |template| - payload[template] ||= 0 - payload[template] += 1 - end - - payload - end - end - - def invalid_templates(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - invalid = [] - payload.keys.each do |template| - invalid << template unless pool_exists?(template) - end - invalid - end - end - - def invalid_template_or_size(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - invalid = [] - payload.each do |pool, size| - invalid << pool unless pool_exists?(pool) - unless is_integer?(size) - invalid << pool - next - end - invalid << pool unless Integer(size) >= 0 - end - invalid - end - end - - def invalid_template_or_path(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - invalid = [] - payload.each do |pool, template| - invalid << pool unless pool_exists?(pool) - invalid << pool unless template.include? '/' - invalid << pool if template[0] == '/' - invalid << pool if template[-1] == '/' - end - invalid - end - end - - def invalid_pool(payload) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do - invalid = [] - payload.each do |pool, _clone_target| - invalid << pool unless pool_exists?(pool) - end - invalid - end - end - - def delete_ondemand_request(request_id) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span| - span.set_attribute('vmpooler.request_id', request_id) - result = { 'ok' => false } - - platforms = backend.hget("vmpooler__odrequest__#{request_id}", 'requested') - unless platforms - e_message = "no request found for request_id '#{request_id}'" - result['message'] = e_message - span.add_event('error', attributes: { - 'error.type' => 'Vmpooler::API::V3.delete_ondemand_request', - 'error.message' => e_message - }) - return result - end - - if backend.hget("vmpooler__odrequest__#{request_id}", 'status') == 'deleted' - result['message'] = 'the request has already been deleted' - else - backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted') - - Parsing.get_platform_pool_count(platforms) do |platform_alias, pool, _count| - backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")&.each do |vm| - backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm) - end - backend.del("vmpooler__#{request_id}__#{platform_alias}__#{pool}") - end - backend.expire("vmpooler__odrequest__#{request_id}", 129_600_0) - end - status 200 - result['ok'] = true - result - end - end - - post "#{api_prefix}/vm/:template/?" do - content_type :json - result = { 'ok' => false } - metrics.increment('http_requests_vm_total.get.vm.template') - - # Template can contain multiple pools separated by +, so validate after parsing - payload = extract_templates_from_query_params(params[:template]) - - if payload - invalid = invalid_templates(payload) - if invalid.empty? - result = atomically_allocate_vms(payload) - else - invalid.each do |bad_template| - metrics.increment("checkout.invalid.#{bad_template}") - end - status 404 - end - else - metrics.increment('checkout.invalid.unknown') - status 404 - end - - JSON.pretty_generate(result) - end - - get "#{api_prefix}/vm/:hostname/?" do - content_type :json - metrics.increment('http_requests_vm_total.get.vm.hostname') - - result = {} - - status 404 - result['ok'] = false - - # Validate hostname - validation = validate_hostname(params[:hostname]) - if validation_error?(validation) - status 400 - return JSON.pretty_generate(validation) - end - - params[:hostname] = hostname_shorten(params[:hostname]) - - rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}") - unless rdata.empty? - status 200 - result['ok'] = true - - result[params[:hostname]] = {} - - result[params[:hostname]]['template'] = rdata['template'] - result[params[:hostname]]['lifetime'] = (rdata['lifetime'] || config['vm_lifetime']).to_i - - if rdata['destroy'] - result[params[:hostname]]['running'] = ((Time.parse(rdata['destroy']) - Time.parse(rdata['checkout'])) / 60 / 60).round(2) if rdata['checkout'] - result[params[:hostname]]['state'] = 'destroyed' - elsif rdata['checkout'] - result[params[:hostname]]['running'] = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2) - result[params[:hostname]]['remaining'] = ((Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60 - Time.now) / 60 / 60).round(2) - result[params[:hostname]]['start_time'] = Time.parse(rdata['checkout']).to_datetime.rfc3339 - result[params[:hostname]]['end_time'] = (Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60).to_datetime.rfc3339 - result[params[:hostname]]['state'] = 'running' - elsif rdata['check'] - result[params[:hostname]]['state'] = 'ready' - else - result[params[:hostname]]['state'] = 'pending' - end - - rdata.keys.each do |key| - if key.match('^tag\:(.+?)$') - result[params[:hostname]]['tags'] ||= {} - result[params[:hostname]]['tags'][$1] = rdata[key] - end - - if key.match('^snapshot\:(.+?)$') - result[params[:hostname]]['snapshots'] ||= [] - result[params[:hostname]]['snapshots'].push($1) - end - end - - if rdata['disk'] - result[params[:hostname]]['disk'] = rdata['disk'].split(':') - end - - # Look up IP address of the hostname - begin - ipAddress = TCPSocket.gethostbyname(params[:hostname])[3] - rescue StandardError - ipAddress = "" - end - - result[params[:hostname]]['ip'] = ipAddress - - if rdata['pool'] - vmdomain = Dns.get_domain_for_pool(full_config, rdata['pool']) - if vmdomain - result[params[:hostname]]['fqdn'] = "#{params[:hostname]}.#{vmdomain}" - end - end - - result[params[:hostname]]['host'] = rdata['host'] if rdata['host'] - result[params[:hostname]]['migrated'] = rdata['migrated'] if rdata['migrated'] - - end - - JSON.pretty_generate(result) - end - - def check_ondemand_request(request_id) - tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span| - span.set_attribute('vmpooler.request_id', request_id) - result = { 'ok' => false } - request_hash = backend.hgetall("vmpooler__odrequest__#{request_id}") - if request_hash.empty? - e_message = "no request found for request_id '#{request_id}'" - result['message'] = e_message - span.add_event('error', attributes: { - 'error.type' => 'Vmpooler::API::V3.check_ondemand_request', - 'error.message' => e_message - }) - return result - end - - result['request_id'] = request_id - result['ready'] = false - result['ok'] = true - status 202 - - case request_hash['status'] - when 'ready' - result['ready'] = true - Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count| - instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}") - domain = Dns.get_domain_for_pool(full_config, pool) - instances.map! { |instance| instance.concat(".#{domain}") } - - if result.key?(platform_alias) - result[platform_alias][:hostname] = result[platform_alias][:hostname] + instances - else - result[platform_alias] = { 'hostname': instances } - end - end - status 200 - when 'failed' - result['message'] = "The request failed to provision instances within the configured ondemand_request_ttl '#{config['ondemand_request_ttl']}'" - status 200 - when 'deleted' - result['message'] = 'The request has been deleted' - status 200 - else - Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, count| - instance_count = backend.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}") - instances_pending = count.to_i - instance_count.to_i - - if result.key?(platform_alias) && result[platform_alias].key?(:ready) - result[platform_alias][:ready] = (result[platform_alias][:ready].to_i + instance_count).to_s - result[platform_alias][:pending] = (result[platform_alias][:pending].to_i + instances_pending).to_s - else - result[platform_alias] = { - 'ready': instance_count.to_s, - 'pending': instances_pending.to_s - } - end - end - end - - result - end - end - - delete "#{api_prefix}/vm/:hostname/?" do - content_type :json - metrics.increment('http_requests_vm_total.delete.vm.hostname') - - result = {} - - status 404 - result['ok'] = false - - # Validate hostname - validation = validate_hostname(params[:hostname]) - if validation_error?(validation) - status 400 - return JSON.pretty_generate(validation) - end - - params[:hostname] = hostname_shorten(params[:hostname]) - - rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}") - unless rdata.empty? - need_token! if rdata['token:token'] - - if backend.srem("vmpooler__running__#{rdata['template']}", params[:hostname]) - backend.sadd("vmpooler__completed__#{rdata['template']}", params[:hostname]) - - status 200 - result['ok'] = true - metrics.increment('delete.success') - update_user_metrics('destroy', params[:hostname]) if Vmpooler::API.settings.config[:config]['usage_stats'] - else - metrics.increment('delete.failed') - end - end - - JSON.pretty_generate(result) - end - - put "#{api_prefix}/vm/:hostname/?" do - content_type :json - metrics.increment('http_requests_vm_total.put.vm.modify') - - status 404 - result = { 'ok' => false } - - failure = [] - - # Validate hostname - validation = validate_hostname(params[:hostname]) - if validation_error?(validation) - status 400 - return JSON.pretty_generate(validation) - end - - params[:hostname] = hostname_shorten(params[:hostname]) - - if backend.exists?("vmpooler__vm__#{params[:hostname]}") - # Validate and sanitize JSON body - jdata = sanitize_json_body(request.body.read) - if validation_error?(jdata) - status 400 - return JSON.pretty_generate(jdata) - end - - # Validate data payload - jdata.each do |param, arg| - case param - when 'lifetime' - need_token! if Vmpooler::API.settings.config[:auth] - - # Validate lifetime is a positive integer - lifetime_int = arg.to_i - if lifetime_int <= 0 - failure.push("Lifetime must be a positive integer (got #{arg})") - next - end - - # in hours, defaults to one week - max_lifetime_upper_limit = config['max_lifetime_upper_limit'] - if max_lifetime_upper_limit - max_lifetime_upper_limit = max_lifetime_upper_limit.to_i - if arg.to_i >= max_lifetime_upper_limit - failure.push("You provided a lifetime (#{arg}) that exceeds the configured maximum of #{max_lifetime_upper_limit}.") - end - end - - when 'tags' - failure.push("You provided tags (#{arg}) as something other than a hash.") unless arg.is_a?(Hash) - - # Validate each tag key and value - arg.each do |key, value| - tag_validation = validate_tag(key, value) - if validation_error?(tag_validation) - failure.push(tag_validation['error']) - end - end - - failure.push("You provided unsuppored tags (#{arg}).") if config['allowed_tags'] && !(arg.keys - config['allowed_tags']).empty? - else - failure.push("Unknown argument #{arg}.") - end - end - - if !failure.empty? - status 400 - result['failure'] = failure - else - jdata.each do |param, arg| - case param - when 'lifetime' - need_token! if Vmpooler::API.settings.config[:auth] - - arg = arg.to_i - - backend.hset("vmpooler__vm__#{params[:hostname]}", param, arg) - when 'tags' - filter_tags(arg) - export_tags(backend, params[:hostname], arg) - end - end - - status 200 - result['ok'] = true - end - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/vm/:hostname/disk/:size/?" do - content_type :json - metrics.increment('http_requests_vm_total.post.vm.disksize') - - need_token! if Vmpooler::API.settings.config[:auth] - - status 404 - result = { 'ok' => false } - - # Validate hostname - validation = validate_hostname(params[:hostname]) - if validation_error?(validation) - status 400 - return JSON.pretty_generate(validation) - end - - # Validate disk size - validated_size = validate_disk_size(params[:size]) - if validation_error?(validated_size) - status 400 - return JSON.pretty_generate(validated_size) - end - - params[:hostname] = hostname_shorten(params[:hostname]) - - if backend.exists?("vmpooler__vm__#{params[:hostname]}") - result[params[:hostname]] = {} - result[params[:hostname]]['disk'] = "+#{params[:size]}gb" - - backend.sadd('vmpooler__tasks__disk', "#{params[:hostname]}:#{params[:size]}") - - status 202 - result['ok'] = true - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/vm/:hostname/snapshot/?" do - content_type :json - metrics.increment('http_requests_vm_total.post.vm.snapshot') - - need_token! if Vmpooler::API.settings.config[:auth] - - status 404 - result = { 'ok' => false } - - params[:hostname] = hostname_shorten(params[:hostname]) - - if backend.exists?("vmpooler__vm__#{params[:hostname]}") - result[params[:hostname]] = {} - - o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten - result[params[:hostname]]['snapshot'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join - - backend.sadd('vmpooler__tasks__snapshot', "#{params[:hostname]}:#{result[params[:hostname]]['snapshot']}") - - status 202 - result['ok'] = true - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/vm/:hostname/snapshot/:snapshot/?" do - content_type :json - metrics.increment('http_requests_vm_total.post.vm.snapshot') - - need_token! if Vmpooler::API.settings.config[:auth] - - status 404 - result = { 'ok' => false } - - params[:hostname] = hostname_shorten(params[:hostname]) - - unless backend.hget("vmpooler__vm__#{params[:hostname]}", "snapshot:#{params[:snapshot]}").to_i.zero? - backend.sadd('vmpooler__tasks__snapshot-revert', "#{params[:hostname]}:#{params[:snapshot]}") - - status 202 - result['ok'] = true - end - - JSON.pretty_generate(result) - end - - delete "#{api_prefix}/config/poolsize/:pool/?" do - content_type :json - result = { 'ok' => false } - - if config['experimental_features'] - need_token! if Vmpooler::API.settings.config[:auth] - - if pool_exists?(params[:pool]) - result = reset_pool_size(params[:pool]) - else - metrics.increment('config.invalid.unknown') - status 404 - end - else - status 405 - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/config/poolsize/?" do - content_type :json - result = { 'ok' => false } - - if config['experimental_features'] - need_token! if Vmpooler::API.settings.config[:auth] - - payload = JSON.parse(request.body.read) - - if payload - invalid = invalid_template_or_size(payload) - if invalid.empty? - result = update_pool_size(payload) - else - invalid.each do |bad_template| - metrics.increment("config.invalid.#{bad_template}") - end - result[:not_configured] = invalid - status 400 - end - else - metrics.increment('config.invalid.unknown') - status 404 - end - else - status 405 - end - - JSON.pretty_generate(result) - end - - delete "#{api_prefix}/config/pooltemplate/:pool/?" do - content_type :json - result = { 'ok' => false } - - if config['experimental_features'] - need_token! if Vmpooler::API.settings.config[:auth] - - if pool_exists?(params[:pool]) - result = reset_pool_template(params[:pool]) - else - metrics.increment('config.invalid.unknown') - status 404 - end - else - status 405 - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/config/pooltemplate/?" do - content_type :json - result = { 'ok' => false } - - if config['experimental_features'] - need_token! if Vmpooler::API.settings.config[:auth] - - payload = JSON.parse(request.body.read) - - if payload - invalid = invalid_template_or_path(payload) - if invalid.empty? - result = update_pool_template(payload) - else - invalid.each do |bad_template| - metrics.increment("config.invalid.#{bad_template}") - end - result[:bad_templates] = invalid - status 400 - end - else - metrics.increment('config.invalid.unknown') - status 404 - end - else - status 405 - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/poolreset/?" do - content_type :json - result = { 'ok' => false } - - if config['experimental_features'] - need_token! if Vmpooler::API.settings.config[:auth] - - begin - payload = JSON.parse(request.body.read) - if payload - invalid = invalid_templates(payload) - if invalid.empty? - result = reset_pool(payload) - else - invalid.each do |bad_pool| - metrics.increment("poolreset.invalid.#{bad_pool}") - end - result[:bad_pools] = invalid - status 400 - end - else - metrics.increment('poolreset.invalid.unknown') - status 404 - end - rescue JSON::ParserError - span = OpenTelemetry::Trace.current_span - span.record_exception(e) - span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed') - status 400 - result = { - 'ok' => false, - 'message' => 'JSON payload could not be parsed' - } - end - else - status 405 - end - - JSON.pretty_generate(result) - end - - post "#{api_prefix}/config/clonetarget/?" do - content_type :json - result = { 'ok' => false } - - if config['experimental_features'] - need_token! if Vmpooler::API.settings.config[:auth] - - payload = JSON.parse(request.body.read) - - if payload - invalid = invalid_pool(payload) - if invalid.empty? - result = update_clone_target(payload) - else - invalid.each do |bad_template| - metrics.increment("config.invalid.#{bad_template}") - end - result[:bad_templates] = invalid - status 400 - end - else - metrics.increment('config.invalid.unknown') - status 404 - end - else - status 405 - end - - JSON.pretty_generate(result) - end - - get "#{api_prefix}/config/?" do - content_type :json - result = { 'ok' => false } - status 404 - - if pools - sync_pool_sizes - sync_pool_templates - - pool_configuration = [] - pools.each do |pool| - pool['template_ready'] = template_ready?(pool, backend) - pool_configuration << pool - end - - result = { - pool_configuration: pool_configuration, - status: { - ok: true - } - } - - status 200 - end - JSON.pretty_generate(result) - end - - get "#{api_prefix}/full_config/?" do - content_type :json - - result = { - full_config: full_config, - status: { - ok: true - } - } - - status 200 - JSON.pretty_generate(result) - end - end - end -end diff --git a/lib/vmpooler/dns.rb b/lib/vmpooler/dns.rb deleted file mode 100644 index 823fe17..0000000 --- a/lib/vmpooler/dns.rb +++ /dev/null @@ -1,91 +0,0 @@ -# frozen_string_literal: true - -require 'pathname' - -module Vmpooler - class Dns - # Load one or more VMPooler DNS plugin gems by name - # - # @param names [Array] The list of gem names to load - def self.load_by_name(names) - names = Array(names) - instance = new - names.map { |name| instance.load_from_gems(name) }.flatten - end - - # Returns the plugin class for the specified dns config by name - # - # @param config [Object] The entire VMPooler config object - # @param name [Symbol] The name of the dns config key to get the dns class - # @return [String] The plugin class for the specifid dns config - def self.get_dns_plugin_class_by_name(config, name) - dns_configs = config[:dns_configs].keys - plugin_class = '' - - dns_configs.map do |dns_config_name| - plugin_class = config[:dns_configs][dns_config_name]['dns_class'] if dns_config_name.to_s == name - end - - plugin_class - end - - # Returns the domain for the specified pool - # - # @param config [String] - the full config structure - # @param pool_name [String] - the name of the pool - # @return [String] - domain name for pool, which is set via reference to the dns_configs block - def self.get_domain_for_pool(config, pool_name) - pool = config[:pools].find { |p| p['name'] == pool_name } - pool_dns_config = pool['dns_plugin'] - dns_configs = config[:dns_configs].keys - dns_configs.map do |dns_config_name| - return config[:dns_configs][dns_config_name]['domain'] if dns_config_name.to_s == pool_dns_config - end - end - - # Returns the plugin domain for the specified dns config by name - # - # @param config [Object] The entire VMPooler config object - # @param name [Symbol] The name of the dns config key to get the dns domain - # @return [String] The domain for the specifid dns config - def self.get_dns_plugin_domain_by_name(config, name) - dns_configs = config[:dns_configs].keys - dns_configs.map do |dns_config_name| - return config[:dns_configs][dns_config_name]['domain'] if dns_config_name.to_s == name - end - end - - # Returns a list of DNS plugin classes specified in the vmpooler configuration - # - # @param config [Object] The entire VMPooler config object - # @return nil || [Array] A list of DNS plugin classes - def self.get_dns_plugin_config_classes(config) - return nil unless config[:dns_configs] - - dns_configs = config[:dns_configs].keys - dns_plugins = dns_configs.map do |dns_config_name| - if config[:dns_configs][dns_config_name] && config[:dns_configs][dns_config_name]['dns_class'] - config[:dns_configs][dns_config_name]['dns_class'].to_s - else - dns_config_name.to_s - end - end.compact.uniq - - # dynamic-dns is not actually a class, it's just used as a value to denote - # that dynamic dns is used so no loading or record management is needed - dns_plugins.delete('dynamic-dns') - - dns_plugins - end - - # Load a single DNS plugin gem by name - # - # @param name [String] The name of the DNS plugin gem to load - # @return [String] The full require path to the specified gem - def load_from_gems(name = nil) - require_path = "vmpooler/dns/#{name.gsub('-', '/')}" - require require_path - require_path - end - end -end diff --git a/lib/vmpooler/dns/base.rb b/lib/vmpooler/dns/base.rb deleted file mode 100644 index 61403ef..0000000 --- a/lib/vmpooler/dns/base.rb +++ /dev/null @@ -1,81 +0,0 @@ -# frozen_string_literal: true - -module Vmpooler - class PoolManager - class Dns - class Base - # These defs must be overidden in child classes - - # Helper Methods - # Global Logger object - attr_reader :logger - # Global Metrics object - attr_reader :metrics - # Provider options passed in during initialization - attr_reader :dns_options - - def initialize(config, logger, metrics, redis_connection_pool, name, options) - @config = config - @logger = logger - @metrics = metrics - @redis = redis_connection_pool - @dns_plugin_name = name - - @dns_options = options - - logger.log('s', "[!] Creating dns plugin '#{name}'") - end - - def pool_config(pool_name) - # Get the configuration of a specific pool - @config[:pools].each do |pool| - return pool if pool['name'] == pool_name - end - - nil - end - - # Returns this dns plugin's configuration - # - # @returns [Hashtable] This dns plugins's configuration from the config file. Returns nil if the dns plugin config does not exist - def dns_config - @config[:dns_configs].each do |dns| - # Convert the symbol from the config into a string for comparison - return (dns[1].nil? ? {} : dns[1]) if dns[0].to_s == @dns_plugin_name - end - - nil - end - - def global_config - # This entire VM Pooler config - @config - end - - def name - @dns_plugin_name - end - - def get_ip(vm_name) - @redis.with_metrics do |redis| - redis.hget("vmpooler__vm__#{vm_name}", 'ip') - end - end - - # returns - # Array[String] : Array of pool names this provider services - def provided_pools - @config[:pools].select { |pool| pool['dns_config'] == name }.map { |pool| pool['name'] } - end - - def create_or_replace_record(hostname) - raise("#{self.class.name} does not implement create_or_replace_record #{hostname}") - end - - def delete_record(hostname) - raise("#{self.class.name} does not implement delete_record for #{hostname}") - end - end - end - end -end diff --git a/lib/vmpooler/metrics/promstats.rb b/lib/vmpooler/metrics/promstats.rb index d0e1ab9..f24f9b9 100644 --- a/lib/vmpooler/metrics/promstats.rb +++ b/lib/vmpooler/metrics/promstats.rb @@ -329,30 +329,6 @@ module Vmpooler buckets: REDIS_CONNECT_BUCKETS, docstring: 'vmpooler redis connection wait time', param_labels: %i[type provider] - }, - vmpooler_health: { - mtype: M_GAUGE, - torun: %i[manager], - docstring: 'vmpooler health check metrics', - param_labels: %i[metric_path] - }, - vmpooler_purge: { - mtype: M_GAUGE, - torun: %i[manager], - docstring: 'vmpooler purge metrics', - param_labels: %i[metric_path] - }, - vmpooler_destroy: { - mtype: M_GAUGE, - torun: %i[manager], - docstring: 'vmpooler destroy metrics', - param_labels: %i[poolname] - }, - vmpooler_clone: { - mtype: M_GAUGE, - torun: %i[manager], - docstring: 'vmpooler clone metrics', - param_labels: %i[poolname] } } end diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 9c6def6..0d908d3 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'vmpooler/dns' require 'vmpooler/providers' require 'vmpooler/util/parsing' require 'spicy-proton' @@ -27,9 +26,6 @@ module Vmpooler # VM Provider objects $providers = Concurrent::Hash.new - # VM DNS objects - $dns_plugins = Concurrent::Hash.new - # Our thread-tracker object $threads = Concurrent::Hash.new @@ -43,9 +39,6 @@ module Vmpooler # load specified providers from config file load_used_providers - - # load specified dns plugins from config file - load_used_dns_plugins end def config @@ -59,7 +52,7 @@ module Vmpooler currently_configured_pools = [] config[:pools].each do |pool| currently_configured_pools << pool['name'] - redis.sadd('vmpooler__pools', pool['name'].to_s) + redis.sadd('vmpooler__pools', pool['name']) pool_keys = pool.keys pool_keys.delete('alias') to_set = {} @@ -67,13 +60,12 @@ module Vmpooler to_set[k] = pool[k] end to_set['alias'] = pool['alias'].join(',') if to_set.key?('alias') - to_set['domain'] = Vmpooler::Dns.get_domain_for_pool(config, pool['name']) - - redis.hmset("vmpooler__pool__#{pool['name']}", *to_set.to_a.flatten) unless to_set.empty? + to_set['domain'] = Parsing.get_domain_for_pool(config, pool['name']) + redis.hmset("vmpooler__pool__#{pool['name']}", to_set.to_a.flatten) unless to_set.empty? end previously_configured_pools.each do |pool| unless currently_configured_pools.include? pool - redis.srem('vmpooler__pools', pool.to_s) + redis.srem('vmpooler__pools', pool) redis.del("vmpooler__pool__#{pool}") end end @@ -82,31 +74,31 @@ module Vmpooler end # Check the state of a VM - def check_pending_vm(vm, pool, timeout, timeout_notification, provider) + def check_pending_vm(vm, pool, timeout, provider) Thread.new do begin - _check_pending_vm(vm, pool, timeout, timeout_notification, provider) + _check_pending_vm(vm, pool, timeout, provider) rescue StandardError => e $logger.log('s', "[!] [#{pool}] '#{vm}' #{timeout} #{provider} errored while checking a pending vm : #{e}") @redis.with_metrics do |redis| - fail_pending_vm(vm, pool, timeout, timeout_notification, redis) + fail_pending_vm(vm, pool, timeout, redis) end raise end end end - def _check_pending_vm(vm, pool, timeout, timeout_notification, provider) + def _check_pending_vm(vm, pool, timeout, provider) mutex = vm_mutex(vm) return if mutex.locked? mutex.synchronize do @redis.with_metrics do |redis| request_id = redis.hget("vmpooler__vm__#{vm}", 'request_id') - if provider.vm_ready?(pool, vm, redis) + if provider.vm_ready?(pool, vm) move_pending_vm_to_ready(vm, pool, redis, request_id) else - fail_pending_vm(vm, pool, timeout, timeout_notification, redis) + fail_pending_vm(vm, pool, timeout, redis) end end end @@ -114,129 +106,39 @@ module Vmpooler def remove_nonexistent_vm(vm, pool, redis) redis.srem("vmpooler__pending__#{pool}", vm) - dns_plugin = get_dns_plugin_class_for_pool(pool) - dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool) - domain = get_dns_plugin_domain_for_pool(pool) - fqdn = "#{vm}.#{domain}" - dns_plugin.delete_record(fqdn) unless dns_plugin_class_name == 'dynamic-dns' $logger.log('d', "[!] [#{pool}] '#{vm}' no longer exists. Removing from pending.") end - def fail_pending_vm(vm, pool, timeout, timeout_notification, redis, exists: true) + def fail_pending_vm(vm, pool, timeout, redis, exists: true) clone_stamp = redis.hget("vmpooler__vm__#{vm}", 'clone') + time_since_clone = (Time.now - Time.parse(clone_stamp)) / 60 - - already_timed_out = time_since_clone > timeout - timing_out_soon = time_since_clone > timeout_notification && !redis.hget("vmpooler__vm__#{vm}", 'timeout_notification') - - return true if !already_timed_out && !timing_out_soon - - if already_timed_out - unless exists + if time_since_clone > timeout + if exists + request_id = redis.hget("vmpooler__vm__#{vm}", 'request_id') + pool_alias = redis.hget("vmpooler__vm__#{vm}", 'pool_alias') if request_id + redis.multi + redis.smove("vmpooler__pending__#{pool}", "vmpooler__completed__#{pool}", vm) + if request_id + ondemandrequest_hash = redis.hgetall("vmpooler__odrequest__#{request_id}") + if ondemandrequest_hash && ondemandrequest_hash['status'] != 'failed' && ondemandrequest_hash['status'] != 'deleted' + # will retry a VM that did not come up as vm_ready? only if it has not been market failed or deleted + redis.zadd('vmpooler__odcreate__task', 1, "#{pool_alias}:#{pool}:1:#{request_id}") + end + end + redis.exec + $metrics.increment("errors.markedasfailed.#{pool}") + $logger.log('d', "[!] [#{pool}] '#{vm}' marked as 'failed' after #{timeout} minutes") + else remove_nonexistent_vm(vm, pool, redis) - return true end - open_socket_error = handle_timed_out_vm(vm, pool, redis) end - - redis.hset("vmpooler__vm__#{vm}", 'timeout_notification', 1) if timing_out_soon - - nonexist_warning = if already_timed_out - "[!] [#{pool}] '#{vm}' marked as 'failed' after #{timeout} minutes with error: #{open_socket_error}" - elsif timing_out_soon - time_remaining = timeout - timeout_notification - open_socket_error = redis.hget("vmpooler__vm__#{vm}", 'open_socket_error') - "[!] [#{pool}] '#{vm}' impending failure in #{time_remaining} minutes with error: #{open_socket_error}" - else - "[!] [#{pool}] '#{vm}' This error is wholly unexpected" - end - $logger.log('d', nonexist_warning) true rescue StandardError => e $logger.log('d', "Fail pending VM failed with an error: #{e}") false end - def handle_timed_out_vm(vm, pool, redis) - request_id = redis.hget("vmpooler__vm__#{vm}", 'request_id') - pool_alias = redis.hget("vmpooler__vm__#{vm}", 'pool_alias') if request_id - open_socket_error = redis.hget("vmpooler__vm__#{vm}", 'open_socket_error') - retry_count = redis.hget("vmpooler__odrequest__#{request_id}", 'retry_count').to_i if request_id - - # Move to DLQ before moving to completed queue - move_to_dlq(vm, pool, 'pending', 'Timeout', - open_socket_error || 'VM timed out during pending phase', - redis, request_id: request_id, pool_alias: pool_alias, retry_count: retry_count) - - clone_error = redis.hget("vmpooler__vm__#{vm}", 'clone_error') - clone_error_class = redis.hget("vmpooler__vm__#{vm}", 'clone_error_class') - redis.smove("vmpooler__pending__#{pool}", "vmpooler__completed__#{pool}", vm) - - if request_id - ondemandrequest_hash = redis.hgetall("vmpooler__odrequest__#{request_id}") - if ondemandrequest_hash && ondemandrequest_hash['status'] != 'failed' && ondemandrequest_hash['status'] != 'deleted' - # Check retry count and max retry limit before retrying - retry_count = (redis.hget("vmpooler__odrequest__#{request_id}", 'retry_count') || '0').to_i - max_retries = $config[:config]['max_vm_retries'] || 3 - - $logger.log('s', "[!] [#{pool}] '#{vm}' checking retry logic: error='#{clone_error}', error_class='#{clone_error_class}', retry_count=#{retry_count}, max_retries=#{max_retries}") - - # Determine if error is likely permanent (configuration issues) - permanent_error = permanent_error?(clone_error, clone_error_class) - $logger.log('s', "[!] [#{pool}] '#{vm}' permanent_error check result: #{permanent_error}") - - if retry_count < max_retries && !permanent_error - # Increment retry count and retry VM creation - redis.hset("vmpooler__odrequest__#{request_id}", 'retry_count', retry_count + 1) - redis.zadd('vmpooler__odcreate__task', 1, "#{pool_alias}:#{pool}:1:#{request_id}") - $logger.log('s', "[!] [#{pool}] '#{vm}' failed, retrying (attempt #{retry_count + 1}/#{max_retries})") - else - # Max retries exceeded or permanent error, mark request as permanently failed - failure_reason = if permanent_error - "Configuration error: #{clone_error}" - else - 'Max retry attempts exceeded' - end - redis.hset("vmpooler__odrequest__#{request_id}", 'status', 'failed') - redis.hset("vmpooler__odrequest__#{request_id}", 'failure_reason', failure_reason) - $logger.log('s', "[!] [#{pool}] '#{vm}' permanently failed: #{failure_reason}") - $metrics.increment("vmpooler_errors.permanently_failed.#{pool}") - end - end - end - $metrics.increment("vmpooler_errors.markedasfailed.#{pool}") - open_socket_error || clone_error - end - - # Determine if an error is likely permanent (configuration issue) vs transient - def permanent_error?(error_message, error_class) - return false if error_message.nil? || error_class.nil? - - permanent_error_patterns = [ - /template.*not found/i, - /template.*does not exist/i, - /invalid.*path/i, - /folder.*not found/i, - /datastore.*not found/i, - /resource pool.*not found/i, - /permission.*denied/i, - /authentication.*failed/i, - /invalid.*credentials/i, - /configuration.*error/i - ] - - permanent_error_classes = [ - 'ArgumentError', - 'NoMethodError', - 'NameError' - ] - - # Check error message patterns - permanent_error_patterns.any? { |pattern| error_message.match?(pattern) } || - # Check error class types - permanent_error_classes.include?(error_class) - end - def move_pending_vm_to_ready(vm, pool, redis, request_id = nil) clone_time = redis.hget("vmpooler__vm__#{vm}", 'clone') finish = format('%